| commit | 5fed49f7d614ae9e83db04703484b31c8077b78c | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Jun 09 21:12:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 09 21:12:25 2014 +0000 |
| tree | d3c7816419fa05eb643c45ba476bb698f2790d70 | |
| parent | 1e6706abb23cd1196a7ef9dd1cc1939220ef7169 [diff] | |
| parent | 4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b [diff] |
am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev * commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b': Allow for a NoOp implementation of DrmManagerClientImpl