| commit | f8bf4acb505d8058e75b8b6f19738ee2c9a4322e | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Aug 21 16:27:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 16:27:33 2015 +0000 |
| tree | 849d18a0d5ad54470904bfbfe7e24004ede61cb3 | |
| parent | 8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db [diff] | |
| parent | fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059 [diff] |
am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere * commit 'fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059': DO NOT MERGE Part of fix for libmedia OOB write anywhere