| commit | f18cce444091d40386fce32ebfdf6b130d07b131 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Jul 24 19:45:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 19:45:17 2015 +0000 |
| tree | 02eefd3c8874871d98dde1d4dbfac3066a5e5454 | |
| parent | 907d0c529b28f03814baccb86421ba376d6203c9 [diff] | |
| parent | ef4cd0a439d30b6b6fdfc5ad78a842422e091331 [diff] |
am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance * commit 'ef4cd0a439d30b6b6fdfc5ad78a842422e091331': DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance