OSDN Git Service

[automerger skipped] Merge "Disable changing lock when device is not provisioned...
authorDoris Ling <dling@google.com>
Thu, 9 Aug 2018 20:17:12 +0000 (13:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 20:17:12 +0000 (13:17 -0700)
commit690a4a199c1a3caff72cc9d0574c1f19a7efe0b5
tree9062cffebe3ec80057da014e7d15c6eafa59bf93
parent4b770e9ac855ab71913894d73f859795931f696a
parent8c84949c84bc6cc11f51d9ec0ffc268e8c82db96
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41  -s ours
am: 8c84949c84  -s ours

Change-Id: Id93d5293c4dd5ab1a0a7b3ca816795351221ef80