From: Doris Ling <dling@google.com>
Date: Fri, 11 May 2018 20:56:47 +0000 (-0700)
Subject: Merge "Rename settings category." into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=374d15333f;p=android-x86%2Fpackages-apps-Settings.git

Merge "Rename settings category." into pi-dev
am: a44d07c10d

Change-Id: I3d71989d34d150c6089e24527a55da35833fae6c
---

374d15333f761301ae467c0fbcfdcfce8e4cef04