| commit | 4e2986940b2ff456693a805026c6910e950c42e2 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Wed Jan 07 10:30:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 10:30:44 2015 +0000 |
| tree | 5a5ece4844d02e6a750f0dd603f1927d6a029aa7 | |
| parent | 2458f2b12b5ec266538b2019b0f14fca4e772bdf [diff] | |
| parent | bf31cb6be4290ce161d99a2a70c318f665a14a77 [diff] |
am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." * commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77': Check for OOM in BitmapFactory's getMimeTypeString().