tree 78aea84412b7abd2190379a762a486d7f9bbf5b4
parent 5f126c0d09b55817d1f94b3845a3c220981a622d
parent 9c9f862065c736bafdb9fc35dc126a59083d58b2
author Jeff Tinker <jtinker@google.com> 1440175245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440175245 +0000

am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit '9c9f862065c736bafdb9fc35dc126a59083d58b2':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere