| commit | 5021ababecee54df6cbf666446af12e69c510a5e | [log] [tgz] |
|---|---|---|
| author | Chavi Weingarten <chaviw@google.com> | Fri Aug 25 16:57:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 25 16:57:56 2017 +0000 |
| tree | 7a7df5487165acb7fe55b886689c703a9f6b560f | |
| parent | afb458f52cf0adaf5ea98477d0b2795a4a978d9f [diff] | |
| parent | 9003586396b251b9e33a77282613e95e5dbf7964 [diff] |
Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev am: f9c0f06526 am: 9003586396 -s ours Change-Id: I3c4de7bcf822c0aa07f79f3481a8a06b28d410aa