OSDN Git Service

Merge "MediaDrm API update" into jb-mr2-dev
authorJeff Tinker <jtinker@google.com>
Tue, 2 Apr 2013 22:49:23 +0000 (22:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Apr 2013 22:49:23 +0000 (22:49 +0000)

Trivial merge