Commits
Vladimir Marko authored and android-build-merger committed a2795c7d287M
resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp automerge: 371d77e * commit '371d77ecf684163b3bd1061e00191980f1fc90a1': Check for OOM in BitmapFactory's getMimeTypeString().
Showing diff tofa71a7433f8