tree 10c5d3e75c0345df432eac43e198d98a6a4383bd
parent e1ab884a67ecbb3cd879493364e9eb1f485d9023
parent 5fed49f7d614ae9e83db04703484b31c8077b78c
author Adam Lesinski <adamlesinski@google.com> 1402363805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402363805 +0000

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