OSDN Git Service

Merge "Reorder "on the lock screen" options." into oc-mr1-dev
authorAlison Cichowlas <asc@google.com>
Wed, 6 Sep 2017 21:01:35 +0000 (21:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Sep 2017 21:01:35 +0000 (21:01 +0000)

Trivial merge