tree 1f2b3affed25194941b30db95c98cf5d4f67952c
parent 696b68c4fc65b671a00cfa82e6bc29a7d665828e
parent 89a2466a2a2859df5f29350117efd7f9d6a2e32f
author Leon Scroggins III <scroggo@google.com> 1423605823 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423605824 +0000

Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev