From: Doris Ling <dling@google.com>
Date: Fri, 11 May 2018 23:01:13 +0000 (-0700)
Subject: Merge "Rename settings category." into pi-dev am: 24044a78bd
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c59a7591ed92a8e7b4c48ba82d3b11062b333bd1;p=android-x86%2Fframeworks-base.git

Merge "Rename settings category." into pi-dev am: 24044a78bd
am: ba5b6dd1ed

Change-Id: Icc2ba94b64fbf09c4618a91a880ea8da91e49d06
---

c59a7591ed92a8e7b4c48ba82d3b11062b333bd1