tree 17cf87f8476b4b3047eaa2acba8eacf79909686d
parent d1646dcfd1d40bdc094f34e05c1359cfc3fa7c65
parent e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8
author Vladimir Marko <vmarko@google.com> 1420712907 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420712907 +0000

am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev

* commit 'e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8':
  Check for OOM in BitmapFactory's getMimeTypeString().