OSDN Git Service

am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of...
authorLeon Scroggins III <scroggo@google.com>
Mon, 15 Jun 2015 14:37:08 +0000 (14:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Jun 2015 14:37:08 +0000 (14:37 +0000)
commite7641e295d3f366b5269cbeeb1ca97a4c99b3791
treedb864862cbf4351a10e6853863a63abde019451e
parenta3de0d9877b9951d964232cd3232f441c1b00379
parentc3809332fca20139543710abc78b185fb1abc9f2
am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev

* commit 'c3809332fca20139543710abc78b185fb1abc9f2':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes