tree cc0df38cebd69ebde738334cf0f6097f2d2374da
parent b36ace7401c0e198ceddd2fdb908346b7bb5928f
parent 425d7c8713679ce9799139f7f91c6a45caa3b486
author Leon Scroggins III <scroggo@google.com> 1432739430 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432739430 +0000

am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE

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