[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev).

am: cd6c636800 -s ours
am skip reason: subject contains skip directive

Change-Id: I505c495256607b7379798bd0c2d926dacc48ca66
This commit is contained in:
Jonathan Scott
2019-05-21 04:10:10 -07:00
committed by android-build-merger

Diff Content Not Available