| commit | 31dcd338b3826928646d77f23f977ecdd52598a3 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jun 10 18:41:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 10 18:41:50 2014 +0000 |
| tree | 62bcf15eb7d991d0c9351c1cf35eb8f5a3887763 | |
| parent | 47a2377ec07ad4ec06ecd25bfd45a37df91e68e6 [diff] | |
| parent | 4299a7c2b049b07b3456a81a4c2b1030523c08ca [diff] |
am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev * commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca': Implement a NoOp DrmManagerClientImpl when no DRM service exists