| commit | a2795c7d2875126004f6d42f7de058e4e04056ca | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Jan 08 10:52:37 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 08 10:52:37 2015 +0000 |
| tree | ee0026f7cfe13e98cdba1e245bb62d0eb2f7049e | |
| parent | fa71a7433f8cf2e8ad3543683103435ecfea5a26 [diff] | |
| parent | 371d77ecf684163b3bd1061e00191980f1fc90a1 [diff] |
resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp automerge: 371d77e * commit '371d77ecf684163b3bd1061e00191980f1fc90a1': Check for OOM in BitmapFactory's getMimeTypeString().