OSDN Git Service

am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 16:49:06 +0000 (16:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 16:49:06 +0000 (16:49 +0000)
* commit '4bbd52382c6eab0b5f2de1ccdfb8da619e40deb7':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere


Trivial merge