| commit | 690a4a199c1a3caff72cc9d0574c1f19a7efe0b5 | [log] [tgz] |
|---|---|---|
| author | Doris Ling <dling@google.com> | Thu Aug 09 13:17:12 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 13:17:12 2018 -0700 |
| tree | 9062cffebe3ec80057da014e7d15c6eafa59bf93 | |
| parent | 4b770e9ac855ab71913894d73f859795931f696a [diff] | |
| parent | 8c84949c84bc6cc11f51d9ec0ffc268e8c82db96 [diff] |
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours am: 8c84949c84 -s ours Change-Id: Id93d5293c4dd5ab1a0a7b3ca816795351221ef80