| commit | 3cfe720a0d250f7aac88fdd303bf34005ebb9ab7 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jun 10 01:30:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 10 01:30:05 2014 +0000 |
| tree | 10c5d3e75c0345df432eac43e198d98a6a4383bd | |
| parent | e1ab884a67ecbb3cd879493364e9eb1f485d9023 [diff] | |
| parent | 5fed49f7d614ae9e83db04703484b31c8077b78c [diff] |
am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev * commit '5fed49f7d614ae9e83db04703484b31c8077b78c': Allow for a NoOp implementation of DrmManagerClientImpl