diff options
author | Gloria Wang <gwang@google.com> | 2011-03-24 12:17:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-24 12:17:12 -0700 |
commit | 199b6924d11a48ca8383392e18ac0f2e58523f01 (patch) | |
tree | 3b1083b61104a2726ae6e2788def132f54ddc368 /include/drm/DrmManagerClient.h | |
parent | a61e0f254f586d59c575e3087992889c0cf026cb (diff) | |
parent | e3f51330a41df2382cf9dfe7fd31598a1aed9a5e (diff) | |
download | frameworks_av-199b6924d11a48ca8383392e18ac0f2e58523f01.zip frameworks_av-199b6924d11a48ca8383392e18ac0f2e58523f01.tar.gz frameworks_av-199b6924d11a48ca8383392e18ac0f2e58523f01.tar.bz2 |
am 3c1c3d89: (-s ours) am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
* commit '3c1c3d898ca1ade5f8ef0f71ddb928af3a780276':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
Diffstat (limited to 'include/drm/DrmManagerClient.h')
0 files changed, 0 insertions, 0 deletions