OSDN Git Service

Merge tag 'android-7.1.1_r25' into cm-14.1
authorDan Pasanen <dan.pasanen@gmail.com>
Mon, 6 Mar 2017 21:57:46 +0000 (15:57 -0600)
committerDan Pasanen <dan.pasanen@gmail.com>
Mon, 6 Mar 2017 21:57:46 +0000 (15:57 -0600)
commit3572432232eec4d41f0dc865ba3d48cb5afb19d1
tree90aa7678e497a1c5dd6bf413632435ef501badac
parent50ae2ffa0396c7b6fd70f83f45f0e1b45d34fac8
parent6bc7cf9d8e3a688945fbf9bbe18f774b576d25f3
Merge tag 'android-7.1.1_r25' into cm-14.1

Android 7.1.1 release 25

Change-Id: I1d2afc4686ca2ddf2432c4dd0bb0737443b12cb5
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl
core/java/com/android/internal/widget/LockPatternUtils.java
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/LockSettingsService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java