Skip to content
Commit 5021abab authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev am: f9c0f065 

am: 90035863  -s ours

Change-Id: I3c4de7bcf822c0aa07f79f3481a8a06b28d410aa
parents afb458f5 90035863
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