OSDN Git Service

Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356...
authorMaurice Lam <yukl@google.com>
Mon, 31 Jul 2017 17:48:54 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 17:48:54 +0000 (17:48 +0000)
commitd0f51e6177af4c120559d292b062ef9212e335d1
tree9d4604bd14b51e0fff68cd6c23a1c3e7a6b4c94f
parent10b3d87d34a65a90fb9432ed28ad86f52c2fae87
parent1b032d9d391be98b43bd030c336a6c60f4419537
Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am: 5faa5ab6ea" into oc-mr1-dev-plus-aosp
am: 1b032d9d39

Change-Id: I6436186aa68674d20537aefcbb5837a68fc73967