OSDN Git Service

Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 9 Aug 2018 19:47:07 +0000 (19:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 9 Aug 2018 19:47:07 +0000 (19:47 +0000)

Trivial merge