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)
commit47efffff85c3836db6832e74f8d495df0833dd81
tree0c990b68e92427f56cf37b7cf7c7b9cf9738c785
parent1642d8df0d071d5a9c0409dc5f96ad2fa2cdc6c1
parente7982e05f6bf9c3f9a2947a433a101b61ddabb2a
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev
am: e7982e05f6

Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2