diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-01-08 10:52:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-08 10:52:37 +0000 |
| commit | a2795c7d2875126004f6d42f7de058e4e04056ca (patch) | |
| tree | ee0026f7cfe13e98cdba1e245bb62d0eb2f7049e /packages | |
| parent | fa71a7433f8cf2e8ad3543683103435ecfea5a26 (diff) | |
| parent | 371d77ecf684163b3bd1061e00191980f1fc90a1 (diff) | |
| download | frameworks_base-a2795c7d2875126004f6d42f7de058e4e04056ca.zip frameworks_base-a2795c7d2875126004f6d42f7de058e4e04056ca.tar.gz frameworks_base-a2795c7d2875126004f6d42f7de058e4e04056ca.tar.bz2 | |
resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp
automerge: 371d77e
* commit '371d77ecf684163b3bd1061e00191980f1fc90a1':
Check for OOM in BitmapFactory's getMimeTypeString().
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions