| commit | c29c1c80f597600fea79f4cd72154a6db2a6261c | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Sat Aug 22 00:40:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 22 00:40:27 2015 +0000 |
| tree | a2e7e4665faf0ea407c43f085ea574c643badf35 | |
| parent | 5d929557d4f990605eac0f5e217df75665e96178 [diff] | |
| parent | b62489d740ac5c66fb48d5a84e33a9588cd3770a [diff] |
am b62489d7: am 53edaffa: am b7d6e637: (-s ours) am 186993d7: am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere * commit 'b62489d740ac5c66fb48d5a84e33a9588cd3770a': DO NOT MERGE Part of fix for libmedia OOB write anywhere