tree 4289326e84e8422c44e53178670e48ccccefacf5
parent a55232a81063031c14eea514daa24f5e2a55ed32
parent 558f5c28c9a1e70dd9ef7ee2fbd33ef407a53de8
author Wei Jia <wjia@google.com> 1445447453 +0000
committer android-build-merger <android-build-merger@google.com> 1445447453 +0000

Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." into mnc-dr-dev am: 7bfd9afefa am: 023815588c
am: 558f5c28c9

* commit '558f5c28c9a1e70dd9ef7ee2fbd33ef407a53de8':
  GenericSource: reset mDrmManagerClient when mDataSource is cleared.