tree 9f9ef3a5988ed9f0db4a09cb3a117c35f7cd2126
parent bcd86896e486e303d285e13477e0623b2a920e78
parent 6e3ee310d90e30c928c9e29a4a07de4bcbf2855e
author Jeff Tinker <jtinker@google.com> 1376948756 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376948756 -0700

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

* commit '6e3ee310d90e30c928c9e29a4a07de4bcbf2855e':
  Remove obsolete drm manager code