tree db8c317dd1f4d64dcf591658b33d978e0cd6800b
parent e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7
parent 192b591cdca78f258dd3260e41d7217f6fc6e36c
author Gloria Wang <gwang@google.com> 1300120378 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300120378 -0700

Merge "- Some change on the DrmManager in order to support feature request 4082089.     In DrmManager, we currently lock both processDrmInfo() and onInfo() which is     ok for now since processDrmInfo() is async call, and it will return without     waiting for onInfo() call. However, if we send an event in processDrmInfo(),     we will got deadlock here because we need to invoke onInf() which will wait     for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1