tree 8fc7c9b4817c8e6310a2c9c25aa0a6b175470e7e
parent 8698c91204d56ea52a4393cd8cf91c9a3a49c4c8
parent 9940c8b6c8ab1711c9ee77cb9288888879b0b310
author Gloria Wang <gwang@google.com> 1300390252 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300390252 -0700

am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1

* commit '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls