| commit | 8143665d70948188d157a7114ee21024863dbecb | [log] [tgz] |
|---|---|---|
| author | Doris Ling <dling@google.com> | Thu Aug 09 15:32:03 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 15:32:03 2018 -0700 |
| tree | 17750193ca6c84f86937e9321f25750e2f71ff8c | |
| parent | 8c84949c84bc6cc11f51d9ec0ffc268e8c82db96 [diff] | |
| parent | bea56da7d6fdc79aa70d369a075f6dddb34ca3a0 [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 Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072