| commit | d476e942d2e7fb50c086b26b3e50636e55eb0e33 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Jul 24 22:41:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 22:41:28 2015 +0000 |
| tree | f9512524e01f368c4fc5882a0a2b4f6ecea2c5eb | |
| parent | b45cb776b7ae43f763200040d6358657ab80f855 [diff] | |
| parent | f18cce444091d40386fce32ebfdf6b130d07b131 [diff] |
am f18cce44: (-s ours) am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance * commit 'f18cce444091d40386fce32ebfdf6b130d07b131': DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance