OSDN Git Service

Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am...
authorMaurice Lam <yukl@google.com>
Mon, 31 Jul 2017 17:48:31 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 17:48:31 +0000 (17:48 +0000)
commit10b3d87d34a65a90fb9432ed28ad86f52c2fae87
tree9d4604bd14b51e0fff68cd6c23a1c3e7a6b4c94f
parent2ce583e934aa9aefb3d4b3947ecac505d8b48f7b
parentd3c2026aaef17bbf99ecef1425f2f0720fa90b43
Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am: 7c5fc6737c
am: d3c2026aae

Change-Id: I6a32995c441a6b48a0eecc9c98864e8504d7739c