tree d8c86badbc1e53832fe2e3cf41f7970843c3f471
parent b03f5627d4e0d80ea7b185e0af1d8a5d19461325
parent 9cfc9eff42a0700029c39e89c38b52488845ad63
author Gloria Wang <gwang@google.com> 1294786556 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294786556 -0800

am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."

* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
  DRM Framework bug fixes.