am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev automerge: dc77ec5 -s ours

automerge: a6fab6e  -s ours

* commit 'a6fab6e114a80364714c463db3ac4b204730f08b':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
This commit is contained in:
Leon Scroggins III
2015-02-10 22:26:33 +00:00
committed by android-build-merger

Diff Content Not Available