| commit | bea56da7d6fdc79aa70d369a075f6dddb34ca3a0 | [log] [tgz] |
|---|---|---|
| author | Doris Ling <dling@google.com> | Thu Aug 09 15:26:36 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 15:26:36 2018 -0700 |
| tree | 145bf33d1f2c7b26437007e9fa41b6f37b2fdb82 | |
| parent | 38b9504a41b6fedfb71fb0f489454313b45b8af9 [diff] | |
| parent | 2ef0e15b665bb5b563685d6f04528a535afa55f6 [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 Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35