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)
commit374d15333f761301ae467c0fbcfdcfce8e4cef04
treeef6a0a93512d471a7b989f31d4af8420a7ab3764
parent71b333f1625b50f92194f1a6f3d45d79c3bfe28f
parenta44d07c10d5e4c894248acd7fc3603e0382f556b
Merge "Rename settings category." into pi-dev
am: a44d07c10d

Change-Id: I3d71989d34d150c6089e24527a55da35833fae6c