| commit | 6c00b9465266727a0eb61c0d1320f0e564b39c51 | [log] [tgz] |
|---|---|---|
| author | Doris Ling <dling@google.com> | Thu Aug 09 13:24:51 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 13:24:51 2018 -0700 |
| tree | ed9a8c129e055dea8b3a46f1257db718bc2926b1 | |
| parent | 44c1ea445a06a380aa478b54c38a49bd7c621758 [diff] | |
| parent | 690a4a199c1a3caff72cc9d0574c1f19a7efe0b5 [diff] |
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours am: 8c84949c84 -s ours am: 690a4a199c -s ours Change-Id: Ib0fbb7fcaa2f0fd26687213d511dfbd185a0eac5