summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2015-09-02 17:48:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-02 17:48:28 +0000
commit38ae119688f94d68c42d8d29958038e37bb74915 (patch)
tree013863aebef76afcb8fe67146a1411451d136c77 /native
parent01232c508e3d28c9c4cac08778c9d80d8d2395de (diff)
parent7cd6aaafda35509607e945fcadc4a556f75ed23b (diff)
downloadframeworks_base-38ae119688f94d68c42d8d29958038e37bb74915.zip
frameworks_base-38ae119688f94d68c42d8d29958038e37bb74915.tar.gz
frameworks_base-38ae119688f94d68c42d8d29958038e37bb74915.tar.bz2
am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit '7cd6aaafda35509607e945fcadc4a556f75ed23b': Allow shell to disable keyguard when not secure
Diffstat (limited to 'native')
0 files changed, 0 insertions, 0 deletions