Skip to content
Commit 97d3ab29 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 skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c6368 is in history

Change-Id: Ieb5f34b6aba4d9369be013a399652eac2f8210e0
parents b2c9f618 66785eeb
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