tree 45dd316437dc0650436d483448528a9caada78de
parent 41e635dcce18df7af6d5d14804bbac028bde6648
parent a666b6980027946c2dfeb8a3529c8e791fc279a4
author Hassan Shojania <shojania@google.com> 1494951437 +0000
committer android-build-merger <android-build-merger@google.com> 1494951437 +0000

Merge "Modular DRM for MediaPlayer/Race at stop/releaseDrm" into oc-dev
am: a666b69800

Change-Id: I9a7d62c2e199bc33dd0677d54647d4d9be02893a