Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit a2795c7d authored by Vladimir Marko's avatar Vladimir Marko Committed by android-build-merger
Browse files

resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp 

automerge: 371d77ec

* commit '371d77ec':
  Check for OOM in BitmapFactory's getMimeTypeString().
parents fa71a743 371d77ec
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment