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

* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.