| commit | 0e39f08a8560ec9d27786ab282b060739f341bf5 | [log] [tgz] |
|---|---|---|
| author | Hassan Shojania <shojania@google.com> | Tue May 16 16:20:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 16:20:23 2017 +0000 |
| tree | 1177f3f7ccc05a12be0e33e7fa01fde9ce5c6d95 | |
| parent | 3160d5702d4152430104728ec754e3a61a40bb1d [diff] | |
| parent | b69caa46e844d5131b3f97f4485c3293cdf9ebde [diff] |
Merge "Modular DRM for MediaPlayer/Race at stop/releaseDrm" into oc-dev am: a666b69800 am: b69caa46e8 Change-Id: I8b0b76d498caa7c8ed7bc9008127a02f4236c399