tree eacc4c3d81ae6bb7b7e6c5c483a6f170a0dbdd30
parent e93a33a8f2706d3918634d17c33491f69060a62c
parent f8bf4acb505d8058e75b8b6f19738ee2c9a4322e
author Jeff Tinker <jtinker@google.com> 1440175004 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440175004 +0000

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