am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1

* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
tree: 5c9eeb0a89d523d8c7f729541e2de382f7d38646
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/