OSDN Git Service

am 186993d7: am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 16:55:19 +0000 (16:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 16:55:19 +0000 (16:55 +0000)
commitb7d6e637c741aecbc3c84bbb259dbc9ab0cfa0f8
treecd2a2983b84ae7384b2fb9192428a78bc9f69188
parentb512e0a3697ccaaf4687867fe0aee8d3dbb7003c
parent186993d738ec3b3c9229f97a5ede86250ff54cfa
am 186993d7: am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit '186993d738ec3b3c9229f97a5ede86250ff54cfa':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere