OSDN Git Service

am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into...
authorJeff Tinker <jtinker@google.com>
Tue, 1 Apr 2014 22:23:21 +0000 (22:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 22:23:21 +0000 (22:23 +0000)
commit53c90cf916ddd1151f042a61a569ea75a220b26e
tree1ee36092a3872180a55a2c75bd177d942e2ae8fb
parent74ee938dcc5e1ab0309dd87278e26f604c756b26
parent6dc8063d2a06017f249181b4b5b07c54ce645943
am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev

* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
  Support CAST V2 Authentication in MediaDrm
media/java/android/media/MediaDrm.java
media/lib/remotedisplay/java/com/android/media/remotedisplay/RemoteDisplay.java