tree 722e6ff0db6fd3b6d8b6a856f38fed5d69b83256
parent 96668903e4d11893ea1f68525713542b0adb5404
parent b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b
author Jeff Tinker <jtinker@google.com> 1396391003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396391003 +0000

am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev

* commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b':
  Support CAST V2 Authentication in MediaDrm