Skip to content
Commit ffc54fc8 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-mr1-dev). am: cd6c6368 -s ours
am: 84778db6 -s ours
am skip reason: subject contains skip directive

Change-Id: I40ef0278707e238f6b3e825f0c661800a02c7afe
parents 71e6ac93 84778db6
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