tree 2f76705c51780ee64c76fa80cd7873d077182462
parent d776139c9d619a9d90325cea2704f413ded86c48
author Baligh Uddin <baligh@google.com> 1438736103 +0000
committer The Android Automerger <android-build@android.com> 1438736190 -0700

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

This reverts commit d383176062362947455866af831d7db6ab085361.

Change-Id: I0509f7eadb3a27c4cadbd3088cb57a588463f457