| commit | eaafe5e711c9147dd50bd091797f56eb6fbc3d9f | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Tue May 21 19:51:33 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 21 19:51:33 2019 -0700 |
| tree | 7402a62fb60b099f558539224814f24057ed81e1 | |
| parent | 4f4d45704d58e48af973989aab008a3a7264ad38 [diff] | |
| parent | 97d3ab297a996049049a1885bf0758d4931a63c1 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739ff am: 66785eeba5 -s ours am: 97d3ab297a -s ours am skip reason: subject contains skip directive Change-Id: If1f2b2c41a0d0fd16e2b618a0f01ac7fead3f98b