OSDN Git Service

Merge "Add new DevicePolicyManager disable flags for keyguard."
authorJim Miller <jaggies@google.com>
Sat, 26 Apr 2014 00:28:43 +0000 (00:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 26 Apr 2014 00:28:44 +0000 (00:28 +0000)
commit66fbe3dc81f2786b2be9afa122038228a31e2cdb
tree372042848a5bf66acf0fa7a63a7bd210bc68a114
parent731bc6bd3192d822d0886bbb2898ba5014c6f040
parent50e62183d4aed2fb8e189196c1809e333e71dd89
Merge "Add new DevicePolicyManager disable flags for keyguard."
api/current.txt
core/java/android/app/admin/DevicePolicyManager.java