OSDN Git Service

Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am: 0bde6dcb18
authorAjay Nadathur <ajayns@google.com>
Wed, 12 Jul 2017 18:11:47 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 18:11:47 +0000 (18:11 +0000)
am: 3d627974d6

Change-Id: Ib062bcdfc23008dab14622e4741fca6dc30e5950


Trivial merge