tree 276bed53acce189d6985f15448f6f07c1cd63b11
parent 0f7712407d96a847845b10eef34d9a259c687533
parent 2adefefa3576142767c45b84d97e05078ead3539
author Leon Scroggins III <scroggo@google.com> 1432749171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432749171 +0000

am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit '2adefefa3576142767c45b84d97e05078ead3539':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE