OSDN Git Service

Merge "Update to lock task features API" into pi-dev
authorBenjamin Franz <bfranz@google.com>
Thu, 29 Mar 2018 09:02:17 +0000 (09:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Mar 2018 09:02:17 +0000 (09:02 +0000)
commit3a5dabbb10861a5cea627936c56693550345b9a8
treefa1ac1de1554e26fb9877fc243a741cae2297923
parent78931a0f95a9406029eda9f438321d8087206966
parent78ae1060c6950c274ef833a5ef64fdd5787056d2
Merge "Update to lock task features API" into pi-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java