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