Skip to content
Commit eaafe5e7 authored by Jonathan Scott's avatar Jonathan Scott Committed by android-build-merger
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739 am: 66785eeb -s ours
am: 97d3ab29 -s ours
am skip reason: subject contains skip directive

Change-Id: If1f2b2c41a0d0fd16e2b618a0f01ac7fead3f98b
parents 4f4d4570 97d3ab29
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment