tree d12562370b73a05321f94e05366a9cc777fb75d0
parent 23ae8a79d8cc629757e18baeaba1e7ddfaccec18
parent 023815588cb8063caca1b2a26abdaa1e222f686e
author Wei Jia <wjia@google.com> 1445446451 +0000
committer android-build-merger <android-build-merger@google.com> 1445446451 +0000

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

* commit '023815588cb8063caca1b2a26abdaa1e222f686e':
  GenericSource: reset mDrmManagerClient when mDataSource is cleared.