summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-05-19 15:26:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-19 15:26:15 +0000
commit22458ab3805d6f0939f7765470fdedaa9ddda01f (patch)
treee8c81b3d85ffe7180526727922da7edda63476f1 /media
parent94a873de0f6d2e1579bc2634712d9212fbe87dc8 (diff)
parent336be7f7a499eec1acd90ab04d3e47d2789c8168 (diff)
downloadframeworks_base-22458ab3805d6f0939f7765470fdedaa9ddda01f.zip
frameworks_base-22458ab3805d6f0939f7765470fdedaa9ddda01f.tar.gz
frameworks_base-22458ab3805d6f0939f7765470fdedaa9ddda01f.tar.bz2
Merge "Improve trust handling on dimsissing keyguard"
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions