OSDN Git Service

Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
authorChavi Weingarten <chaviw@google.com>
Fri, 25 Aug 2017 16:40:02 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Aug 2017 16:40:02 +0000 (16:40 +0000)
commit9003586396b251b9e33a77282613e95e5dbf7964
treed81663ebe24efd202812fff590b52501638c7f5d
parentfe35ec5daf7ae7d08d069083cf401887ca3cd06a
parentf9c0f0652695ae0fd91bcee122142a66eb9302cd
Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
am: f9c0f06526

Change-Id: I5e683ce2a92b195804b883cce425200180130815