tree b987e932abf97aae86ad60069927e1606404cea9
parent 7fb865653293e665f48b31e791ca124e98c7d257
parent 29d060155e2c3e838fcadf303fcf2d1ecfb78710
author Jeff Tinker <jtinker@google.com> 1376948891 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376948891 -0700

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

* commit '29d060155e2c3e838fcadf303fcf2d1ecfb78710':
  Remove obsolete drm manager code