tree dcd2d88683b244b9cba9de4bac8dc572425f148d
parent 20a8f8b1ae72d2dca1438ac931ed847e2e55aadf
parent 3503445e59227bd4fd6950354400a64db451a2e9
author TreeHugger Robot <treehugger-gerrit@google.com> 1533840214 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1533840214 +0000

Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
  DO NOT MERGE Disable changing lock when device is not provisioned.