Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
* changes: [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:c624deaff5am:c056ac3011am:782fc16dc4am:aaa67659a6skipped:1b622b07be[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:c624deaff5am:c056ac3011am:782fc16dc4am:aaa67659a6[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:c624deaff5am:c056ac3011am:782fc16dc4[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:c624deaff5am:c056ac3011[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:c624deaff5DO NOT MERGE Disable changing lock when device is not provisioned.
This commit is contained in:
committed by
Android (Google) Code Review
commit
528be61eeb