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)
commit0474f567ba1689e0c11df3917e332c1317afccda
tree7b4efd08e5d8fb27eb9194233dff71626c18aa04
parenta47967b820edccb9517698d8c2a1740626360373
parent47efffff85c3836db6832e74f8d495df0833dd81
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-mr1-dev am: e7982e05f6
am: 47efffff85

Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e