OSDN Git Service

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent...
authorJonathan Scott <scottjonathan@google.com>
Wed, 22 May 2019 02:51:33 +0000 (19:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 May 2019 02:51:33 +0000 (19:51 -0700)
commiteaafe5e711c9147dd50bd091797f56eb6fbc3d9f
tree7402a62fb60b099f558539224814f24057ed81e1
parent4f4d45704d58e48af973989aab008a3a7264ad38
parent97d3ab297a996049049a1885bf0758d4931a63c1
[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