tree 975997a658da486bace98acf7c39796de5efb2e1
parent c010c96fdf143b242c9795a71b231ccb4658b625
parent 152d7282a42cd7130648f373775fe75d319557f2
author Vladimir Marko <vmarko@google.com> 1420712688 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1420712691 +0000

Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev