tree 3f67ae807317fb68adb8a12093ce056c39279959
parent 667d55cf5a06a0e1bd12997fcd494bec52e58ad9
parent efa5b6142082d8c958b09a932fc972261c405912
author Leon Scroggins III <scroggo@google.com> 1423614911 +0000
committer android-build-merger <android-build-merger@google.com> 1423614911 +0000

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

* commit 'efa5b6142082d8c958b09a932fc972261c405912':