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