tree 891bebafd0a386add7ecb007401b3698044a7a87
parent f4f7e0c102819f039ebb1972b3dba1d3186bc1d1
author Jeff Tinker <jtinker@google.com> 1429743496 -0700
committer The Android Automerger <android-build@google.com> 1437671462 -0700

DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance

Bug: 22414321

Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc
related-to-bug: 18394494
related-to-bug: 19664283
(cherry picked from commit 2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be)