OSDN Git Service

Merge "Align screen lock options to view start" into oc-dr1-dev
authorMaurice Lam <yukl@google.com>
Mon, 31 Jul 2017 17:41:13 +0000 (17:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 17:41:13 +0000 (17:41 +0000)
commit7c5fc6737cab9ff42b197fa796b6c5cfc3c81fbc
tree5cb6071eb1cc179207ebdcb5feb5a1a666c62bdd
parentd58a499c0207ee953fe77698b036f44173b19861
parent5e2e0df356231569e86c7e0c348d9323fcb3b119
Merge "Align screen lock options to view start" into oc-dr1-dev
am: 5e2e0df356

Change-Id: I5e4e5714d6e881ad25771da7fca5c27996f68617