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)
1  2 
api/current.txt
core/java/android/app/admin/DevicePolicyManager.java

diff --cc api/current.txt
Simple merge