tree 7e695ad41085ce7442dc7256312d558ec4bc86b0
parent 47238183b96e04a1115abafe0dc2643f8817ff43
parent 3c1c3d898ca1ade5f8ef0f71ddb928af3a780276
author Gloria Wang <gwang@google.com> 1300994232 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300994232 -0700

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.