OSDN Git Service

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

Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e


Trivial merge