Skip to content
Commit 90035863 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

Change-Id: I5e683ce2a92b195804b883cce425200180130815
parents fe35ec5d f9c0f065
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