| commit | bf31cb6be4290ce161d99a2a70c318f665a14a77 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Wed Jan 07 10:24:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 10:24:43 2015 +0000 |
| tree | 5556e340fe2929a2258050495409fee6dc02e548 | |
| parent | 21735e222e0009b1ddcb080faa5b51117d0da879 [diff] | |
| parent | 8371f2e3fac04663dae2e5fb98dbce7e32325991 [diff] |
am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." * commit '8371f2e3fac04663dae2e5fb98dbce7e32325991': Check for OOM in BitmapFactory's getMimeTypeString().