| commit | 42b8cf7b944b314cb2059665a9e58a3be64b812c | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Thu Oct 15 16:24:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 15 16:24:51 2015 +0000 |
| tree | ba5b89fa5c7044c52573061ced0bc434e492eae5 | |
| parent | 6957863e0e6935153399978b81ebc4cdac68fef9 [diff] | |
| parent | 81ce705a10ec12fa54848375675d25bc5a89c737 [diff] |
am 81ce705a: am fef64426: am 900695d5: am 5c078a16: am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev * commit '81ce705a10ec12fa54848375675d25bc5a89c737': DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel