| commit | 6dc8063d2a06017f249181b4b5b07c54ce645943 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Tue Apr 01 22:00:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 22:00:49 2014 +0000 |
| tree | e69c2307327b432b677567ebc9b587d791c75c3d | |
| parent | ffb22827d74fcb7872a912ca022800a9b0818695 [diff] | |
| parent | 433a063309ba9ff9cdce4f9688e027c642a79505 [diff] |
am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev * commit '433a063309ba9ff9cdce4f9688e027c642a79505': Support CAST V2 Authentication in MediaDrm