diff options
author | Gloria Wang <gwang@google.com> | 2011-03-17 12:38:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 12:38:40 -0700 |
commit | 454b2d1c34238ba33d8f6861971a74c80c3e302a (patch) | |
tree | ff078839aaf33111641bad0c51337a27e2d15849 /media/libmedia | |
parent | 08aa2cbd5e62e7ca140f78f8bea0477a19880fd9 (diff) | |
parent | 2c3257b21ddf2a3da843f11d1bb3b4fa8e912707 (diff) | |
download | frameworks_base-454b2d1c34238ba33d8f6861971a74c80c3e302a.zip frameworks_base-454b2d1c34238ba33d8f6861971a74c80c3e302a.tar.gz frameworks_base-454b2d1c34238ba33d8f6861971a74c80c3e302a.tar.bz2 |
am 2c3257b2: 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 '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
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
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions