tree 5621aebd2b3dcfbbf94c217e5c6de6d42d9a5eaf
parent b3cc9b087e777971be17e2c1dfbc7c53bf4c975b
author Jeff Tinker <jtinker@google.com> 1429743496 -0700
committer The Android Automerger <android-build@android.com> 1441155901 -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)