OSDN Git Service

am 7020a137: Merge "MediaDrm API Updates per api council review" into mnc-dev
authorJeff Tinker <jtinker@google.com>
Fri, 15 May 2015 22:22:26 +0000 (22:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 22:22:26 +0000 (22:22 +0000)
* commit '7020a1377a65fb7f61a5bd36c254f99f0827932b':
  MediaDrm API Updates per api council review


Trivial merge