OSDN Git Service

Merge "Add new permission and action for managed provisioning (QR flow)"
authorSteven Ng <stevenckng@google.com>
Thu, 4 Feb 2016 10:24:44 +0000 (10:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Feb 2016 10:24:44 +0000 (10:24 +0000)
commitee081d5bd0fdbe7224382da7ce388b9d21f21c78
treefc3c4412dfef0d47183a981b734a3085fb133c16
parent95aaf5d5b0050441d4160aeb5b96605d597b67e2
parent980a1b6fa872f82133a7421bcfe14e2b03a0745e
Merge "Add new permission and action for managed provisioning (QR flow)"
api/system-current.txt
core/java/android/app/admin/DevicePolicyManager.java
core/res/AndroidManifest.xml