| commit | 36401a369949dc12a76d452f2d5213c8b09d903e | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Jan 08 10:28:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 08 10:28:27 2015 +0000 |
| tree | 17cf87f8476b4b3047eaa2acba8eacf79909686d | |
| parent | d1646dcfd1d40bdc094f34e05c1359cfc3fa7c65 [diff] | |
| parent | e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8 [diff] |
am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev * commit 'e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8': Check for OOM in BitmapFactory's getMimeTypeString().