OSDN Git Service

[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 21:04:09 +0000 (21:04 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 21:04:09 +0000 (21:04 +0000)
commit1b622b07bed468ce82bc4739e0ebf348f755e65e
treea76b81b93af04870c5e787659821acbd4fff02e0
parent78da279398a283cab46298b652f8993abc83d1d7
parentaaa67659a65168deacb515d9cb9274b386c56459
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6

Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/SettingsActivity.java