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

[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/... 

[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am: 3be29d42
am: c0c0827d -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c6368 is in history

Change-Id: Ie04bbf63da652c54cf3eac6d6a480d239d165274
parents cd6c6368 c0c0827d
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