tree ec6725e025241ce5589549c33fa03a0fa23881e7
parent f9259107342559456105392e3387a3c8a1e5d6e4
parent dc77ec59beb23a2ff300d5048633687c0d68a0ac
author Leon Scroggins III <scroggo@google.com> 1423606423 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423606423 +0000

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

* commit 'dc77ec59beb23a2ff300d5048633687c0d68a0ac':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE