| commit | 55eb6566c5818f4c6d4c03d3b011179aa680e2ce | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Sat Jul 25 16:48:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 16:48:31 2015 +0000 |
| tree | df8087ae6fe1c771d53dbadb4389ecf2d016e7d4 | |
| parent | 6ec7e500cf7d1377f5b22266b0e5b5ec0e460c7b [diff] | |
| parent | 00c5b26a3e3d77227a26990a28b8bd2976592a9f [diff] |
am 00c5b26a: (-s ours) am d476e942: am f18cce44: (-s ours) am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance * commit '00c5b26a3e3d77227a26990a28b8bd2976592a9f': DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance