OSDN Git Service

[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisione...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 01:00:48 +0000 (01:00 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 3 Aug 2018 01:00:48 +0000 (01:00 +0000)
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece


Trivial merge