| commit | 80fbbc45127e0c356618acb1c391f1bb5f20730f | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Tue Apr 01 22:27:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 22:27:47 2014 +0000 |
| tree | a7239feb8b05f5715a81f2b4154b3555189c1190 | |
| parent | 12184e17805be07181b065a7bfd16f71e5d2fa01 [diff] | |
| parent | 53c90cf916ddd1151f042a61a569ea75a220b26e [diff] |
am 53c90cf9: am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev * commit '53c90cf916ddd1151f042a61a569ea75a220b26e': Support CAST V2 Authentication in MediaDrm