OSDN Git Service

Merge "Added a category for lockscreen settings." into oc-dr1-dev
authorKatsiaryna Naliuka <katsiaryna@google.com>
Tue, 13 Jun 2017 22:23:23 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 22:23:23 +0000 (22:23 +0000)
am: 7cb007c6d3

Change-Id: Ifd60b2b309fe7e251c13844ef5473bad1a73c757


Trivial merge