summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2014-03-10 19:08:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-10 19:08:36 +0000
commitb08216c082da6ae0e7ec2f2161f4e16ffb3a1569 (patch)
tree0e7d5d922e407ab801edb25b101e81f389b6527e /packages/Keyguard/src/com/android
parentf0768d71bdba1db5bf70fbe9aa587ae7e652df21 (diff)
parent7d50596a9c27b6db6468009ad196707e08f88bd6 (diff)
downloadframeworks_base-b08216c082da6ae0e7ec2f2161f4e16ffb3a1569.zip
frameworks_base-b08216c082da6ae0e7ec2f2161f4e16ffb3a1569.tar.gz
frameworks_base-b08216c082da6ae0e7ec2f2161f4e16ffb3a1569.tar.bz2
am 7d50596a: am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit '7d50596a9c27b6db6468009ad196707e08f88bd6': Add CAP_BLOCK_SUSPEND to system server
Diffstat (limited to 'packages/Keyguard/src/com/android')
0 files changed, 0 insertions, 0 deletions