tree d58529815cfcf9ea9d9a92cf70917625ff64ce9b
parent c4122f56d6c3425666b67a81ed2d7224c8a4cda3
parent 0592e3cc541aa0c6477e00ddb052558a5a3e17c1
author Gloria Wang <gwang@google.com> 1299715864 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299715864 -0800

am 256290b1: am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs   are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1

* commit '256290b1efac8b0798964585c3c3d4600d9587ef':
  - Change level of some LOGs from LOGE to LOGV because those logs   are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039