OSDN Git Service

Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-mr1-dev
authorWei Jia <wjia@google.com>
Wed, 13 Jul 2016 01:48:07 +0000 (01:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Jul 2016 01:48:09 +0000 (01:48 +0000)

Trivial merge