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