tree 4101430bfb7257571ab92ec9a33fe00a37e7a1cc
parent 87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee
parent f8bf3c46f524b1252bf466a351daaef61afdcecb
author Gloria Wang <gwang@google.com> 1300384183 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300384183 -0700

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