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