tree ca75e72185af2ad3377165e1684ef049a3606b7b
parent 4ec5179bf8cdebe37538fd22a690f20783a2b010
parent 8862028032790fe2ec3f6114de6b2e98a296e6df
author Gloria Wang <gwang@google.com> 1299715673 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299715673 -0800

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 '54fe58562bb8df5155d4cdf3eb22d950be9dd273':
  - 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