| commit | 186993d738ec3b3c9229f97a5ede86250ff54cfa | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Aug 21 16:49:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 16:49:06 2015 +0000 |
| tree | 78aea84412b7abd2190379a762a486d7f9bbf5b4 | |
| parent | 0ea1da27437575f6b075860fa858a257c806d5ef [diff] | |
| parent | 4bbd52382c6eab0b5f2de1ccdfb8da619e40deb7 [diff] |
am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere * commit '4bbd52382c6eab0b5f2de1ccdfb8da619e40deb7': DO NOT MERGE Part of fix for libmedia OOB write anywhere