| commit | 89bfe0a0b891b0313c4fee4fa69619aba0ff420b | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Aug 27 20:36:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:36:23 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 3bc42fc487fa1b45170de8ff21384c1a22307a6e [diff] | |
| parent | 927be92152134dfb1238bb5a4b6a754f0f49e43b [diff] |
am 927be921: (-s ours) am 299063a5: (-s ours) 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 '927be92152134dfb1238bb5a4b6a754f0f49e43b':