OSDN Git Service

Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev...
authorWei Jia <wjia@google.com>
Thu, 14 Jul 2016 01:22:43 +0000 (01:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 01:22:43 +0000 (01:22 +0000)
commitd3cc672f30d19fbed006e5c06655354c45178cbf
treeb649a4d723cc01f4d5ddebec5353bb9ef2619e12
parentdc327ee1291c8e34460d829bccd72c92f818c37d
parent27a1e97ae4de6da7e0ded274680c4467cf7b10c8
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am: 9604b3803c
am: 27a1e97ae4

Change-Id: I4ef412061dc509c0deee145cdeb09afeb3032df2