OSDN Git Service

Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev
authorWei Jia <wjia@google.com>
Wed, 13 Jul 2016 02:09:07 +0000 (02:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 02:09:07 +0000 (02:09 +0000)
am: e7982e05f6

Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2


Trivial merge