OSDN Git Service

Merge "Reorder "on the lock screen" options." into oc-mr1-dev
authorAlison Cichowlas <asc@google.com>
Wed, 6 Sep 2017 21:23:52 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 21:23:52 +0000 (21:23 +0000)
am: 40b8d3d238

Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1


Trivial merge