OSDN Git Service

Merge "Rename settings category." into pi-dev
authorDoris Ling <dling@google.com>
Fri, 11 May 2018 20:56:47 +0000 (13:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 20:56:47 +0000 (13:56 -0700)
am: a44d07c10d

Change-Id: I3d71989d34d150c6089e24527a55da35833fae6c


Trivial merge