tree a9d4e84c8d5646061e88c315fb58166925666cc8
parent 7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0
parent b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011
author Marco Nelissen <marcone@google.com> 1336417742 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336417742 -0700

Merge "Fix crash when decoding bitmap" into jb-dev