Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev

am: 4c9fa739ff

Change-Id: I300dda26365dab7052b74383a302676f3e99be55
This commit is contained in:
Jonathan Scott
2019-05-21 13:57:03 -07:00
committed by android-build-merger

Diff Content Not Available