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 01:03:02 +0000 (01:03 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 01:03:02 +0000 (01:03 +0000)
commit3503445e59227bd4fd6950354400a64db451a2e9
treedcd2d88683b244b9cba9de4bac8dc572425f148d
parent78da279398a283cab46298b652f8993abc83d1d7
parentd98908e7c70307b95df4d00c95a99cbea69d6741
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7

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