commit | 9003586396b251b9e33a77282613e95e5dbf7964 | [log] [tgz] |
---|---|---|
author | Chavi Weingarten <chaviw@google.com> | Fri Aug 25 16:40:02 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 25 16:40:02 2017 +0000 |
tree | d81663ebe24efd202812fff590b52501638c7f5d | |
parent | fe35ec5daf7ae7d08d069083cf401887ca3cd06a [diff] | |
parent | f9c0f0652695ae0fd91bcee122142a66eb9302cd [diff] |
Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev am: f9c0f06526 Change-Id: I5e683ce2a92b195804b883cce425200180130815