| commit | c3809332fca20139543710abc78b185fb1abc9f2 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Mon Jun 15 14:30:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 14:30:20 2015 +0000 |
| tree | 6dac7edc69e18684cb8e71a8341bc358ab0bdc25 | |
| parent | 7d79bea4a92760559f61cfbe412cd8470b84c9fc [diff] | |
| parent | 8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7 [diff] |
am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev * commit '8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7': DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes