| commit | 835a765a3abc720d196960d9ecf17e098327baf4 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Apr 14 16:46:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 14 16:46:07 2017 +0000 |
| tree | e892265486175720443db068d58d29a443952bd5 | |
| parent | cc6759b193a8a02a1c361bd2b2d86d4607330696 [diff] | |
| parent | a29ecc1a1ca4712d0adc40114e7af796af2feb04 [diff] |
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd51 am: a29ecc1a1c Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003