[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev). am: cd6c636800 -s ours am: 84778db6b6 -s ours am: ffc54fc8b9

Browse Source

am: 1eeffeb98c

Change-Id: I79112461e122b72ff05fde5d130180a289ee9124

...

This commit is contained in:

Jonathan Scott

2019-05-21 11:52:18 -07:00

committed by android-build-merger

parent 98bbe9ae3d 1eeffeb98c

commit d481577b64

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available