summaryrefslogtreecommitdiffstats
path: root/core/jni/AndroidRuntime.cpp
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-04-01 22:00:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-01 22:00:49 +0000
commit6dc8063d2a06017f249181b4b5b07c54ce645943 (patch)
treee69c2307327b432b677567ebc9b587d791c75c3d /core/jni/AndroidRuntime.cpp
parentffb22827d74fcb7872a912ca022800a9b0818695 (diff)
parent433a063309ba9ff9cdce4f9688e027c642a79505 (diff)
downloadframeworks_base-6dc8063d2a06017f249181b4b5b07c54ce645943.zip
frameworks_base-6dc8063d2a06017f249181b4b5b07c54ce645943.tar.gz
frameworks_base-6dc8063d2a06017f249181b4b5b07c54ce645943.tar.bz2
am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '433a063309ba9ff9cdce4f9688e027c642a79505': Support CAST V2 Authentication in MediaDrm
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
0 files changed, 0 insertions, 0 deletions