| commit | b3ad03f0baf9c8d7c7f0516cce865a7f936b9fb4 | [log] [tgz] |
|---|---|---|
| author | Doris Ling <dling@google.com> | Thu Aug 09 15:40:59 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 15:40:59 2018 -0700 |
| tree | 9062cffebe3ec80057da014e7d15c6eafa59bf93 | |
| parent | 690a4a199c1a3caff72cc9d0574c1f19a7efe0b5 [diff] | |
| parent | 8143665d70948188d157a7114ee21024863dbecb [diff] |
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours am: 2ef0e15b66 -s ours am: bea56da7d6 -s ours am: 8143665d70 -s ours Change-Id: Id4783d9333f538d739c0ef6546738d2a46a4e2d9