commit | 3d627974d636783a51a52788c1a3643d3e2fc4f9 | [log] [tgz] |
---|---|---|
author | Ajay Nadathur <ajayns@google.com> | Wed Jul 12 18:04:26 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 12 18:04:26 2017 +0000 |
tree | 239c38628cc5aaa8f94ec02cd830e684c5ed845b | |
parent | eba886f045d3b546e4c6b7a7177d82b5382a5292 [diff] | |
parent | 0bde6dcb188d3808e7dce5f4393d9b73a5227685 [diff] |
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am: 0bde6dcb18 Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d