OSDN Git Service

am ffe36bfb: (-s ours) am 1b4eed56: am 557ee34d: (-s ours) am 2adefefa: am b6e3f930...
authorLeon Scroggins III <scroggo@google.com>
Wed, 27 May 2015 20:51:11 +0000 (20:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 20:51:11 +0000 (20:51 +0000)
commit97e854bc6c52390bc093dd4a456364dccf3e7eb1
tree50fcef7b0bcc6fe5a9805c707ef9475b6f284816
parenta2f47be64b9a1af0ae621db0168366e457b31a3e
parentffe36bfbec4fc5fca89dca713c385c0fa6ee75c0
am ffe36bfb: (-s ours) am 1b4eed56: am 557ee34d: (-s ours) 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 'ffe36bfbec4fc5fca89dca713c385c0fa6ee75c0':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE