| commit | 53edaffa7dada92513bf7cffd35eb1b1a2f38e67 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Aug 21 17:01:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 17:01:59 2015 +0000 |
| tree | 3e299d3185d46ab0261dc2a0f92438213d428a1f | |
| parent | e2c8978855ba383b20c43f77b393632960319ffe [diff] | |
| parent | b7d6e637c741aecbc3c84bbb259dbc9ab0cfa0f8 [diff] |
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 'b7d6e637c741aecbc3c84bbb259dbc9ab0cfa0f8': DO NOT MERGE Part of fix for libmedia OOB write anywhere