| commit | e2c8978855ba383b20c43f77b393632960319ffe | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Fri Aug 21 15:54:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 15:54:02 2015 +0000 |
| tree | 3e299d3185d46ab0261dc2a0f92438213d428a1f | |
| parent | 588d7b8dc4c000f1a9a4510e9510cb3b2810404c [diff] | |
| parent | b512e0a3697ccaaf4687867fe0aee8d3dbb7003c [diff] |
am b512e0a3: (-s ours) am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev * commit 'b512e0a3697ccaaf4687867fe0aee8d3dbb7003c': DO NOT MERGE Part of fix for libmedia OOB write anywhere