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)
commit22fc09757e209ccb23090d528f7b49c549f9979b
treebcf794a549e5817f0a3763a345a8ed2d00068efa
parent08c4871dbe6c1f5cff46d46a56f2bc82ad61d792
parent40b8d3d238e59e1d00e56a1ea650d817ee78c626
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
am: 40b8d3d238

Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1