| commit | b7d6e637c741aecbc3c84bbb259dbc9ab0cfa0f8 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Aug 21 16:55:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 16:55:19 2015 +0000 |
| tree | cd2a2983b84ae7384b2fb9192428a78bc9f69188 | |
| parent | b512e0a3697ccaaf4687867fe0aee8d3dbb7003c [diff] | |
| parent | 186993d738ec3b3c9229f97a5ede86250ff54cfa [diff] |
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 '186993d738ec3b3c9229f97a5ede86250ff54cfa': DO NOT MERGE Part of fix for libmedia OOB write anywhere