tree ea742a9faaba650da020a11f332ffc36f8e1217b
parent 46910bdc57c35ac36bd4adcbb76f4f3a590e3f21
parent 31d49615007372621ac3fba55e9e3aab48c873f9
author Jeff Tinker <jtinker@google.com> 1376948355 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376948355 -0700

am 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '31d49615007372621ac3fba55e9e3aab48c873f9':
  Remove obsolete drm manager code