tree 9183f61e0f1dd95a85b9c528bb874698cd429d25
parent 733ba4dc9161741930464818618855962bdb1297
parent 23ae2999e83897133b743b2eabade403f7233393
author Jeff Tinker <jtinker@google.com> 1377555472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377555472 -0700

am 23ae2999: am 3bd3690f: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev

* commit '23ae2999e83897133b743b2eabade403f7233393':
  Enhancement for OnInfo callback on DRM Framework