summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-04-26 00:35:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-26 00:35:45 +0000
commit953c4e04fab58678020a5741ba869b44aee581f4 (patch)
treeb3468e52f9181c6ce7901cd3f9ffcfbb84913240 /telephony
parent163b9bb55a104db6672d2a892ea47d9074f1b08c (diff)
parent66fbe3dc81f2786b2be9afa122038228a31e2cdb (diff)
downloadframeworks_base-953c4e04fab58678020a5741ba869b44aee581f4.zip
frameworks_base-953c4e04fab58678020a5741ba869b44aee581f4.tar.gz
frameworks_base-953c4e04fab58678020a5741ba869b44aee581f4.tar.bz2
am 427b7fb5: Merge "Add new DevicePolicyManager disable flags for keyguard."
* commit '427b7fb50b5c2c8f38612a74a7c46ff056e22e68': Add new DevicePolicyManager disable flags for keyguard.
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions