tree dcd2d88683b244b9cba9de4bac8dc572425f148d
parent 94ea2dad5b936381d8ea0195ea7e63df956c0aed
parent 1b622b07bed468ce82bc4739e0ebf348f755e65e
author TreeHugger Robot <treehugger-gerrit@google.com> 1533839652 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1533839652 +0000

Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
  DO NOT MERGE Disable changing lock when device is not provisioned.