OSDN Git Service

Merge "forceUpdateUserSetupComplete should have no effect in user build"
authorVictor Chang <vichang@google.com>
Tue, 30 Aug 2016 12:38:51 +0000 (12:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 Aug 2016 12:38:53 +0000 (12:38 +0000)
commit3f98ea1eeef5bed165f77d1cf64b8d4b2dd3f0b4
tree290ad33d03c709c59d1498ee2039ce25a07103ae
parent808699f2bb30dbe3684b32cc378093e032ce1fd8
parent3577ed2556f20f7ab09e58b6b286217c7e1560c9
Merge "forceUpdateUserSetupComplete should have no effect in user build"
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java