Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
* changes: [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:cd0b97e86fam:d98908e7c7skipped:3503445e59[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:cd0b97e86fam:d98908e7c7[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:cd0b97e86fDO NOT MERGE Disable changing lock when device is not provisioned.
This commit is contained in:
committed by
Android (Google) Code Review
commit
197a10b053