OSDN Git Service

Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
authorMaurice Lam <yukl@google.com>
Tue, 11 Jul 2017 18:27:30 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 18:27:30 +0000 (18:27 +0000)
am: 540d92a7e9

Change-Id: I63b9b138b1918d066a85d19c5f91221acdd3e083


Trivial merge