OSDN Git Service

Merge "MediaPlayer/ModularDrm API review" into oc-dev
authorHassan Shojania <shojania@google.com>
Tue, 18 Apr 2017 18:50:32 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 18:50:32 +0000 (18:50 +0000)
commit8f0dce63ce18d93edb587501007c89e22046db22
tree0ad8ada3d948cdd186dedf0f385c4d070e37a130
parentd5d6f3e88a9e193c95bc7efea1e166994fe269fd
parent62a5d29f2d31ddb8c205e8f134bbdfb86d1d36ec
Merge "MediaPlayer/ModularDrm API review" into oc-dev
am: 62a5d29f2d

Change-Id: Id4e021e15c0c42a8c075fd393c07938e17e9a6fe
api/current.txt
api/system-current.txt
api/test-current.txt