From: Fan Zhang <zhfan@google.com>
Date: Wed, 6 Sep 2017 21:23:04 +0000 (+0000)
Subject: Merge "Misc polishing fixes for Settings" into oc-mr1-dev
X-Git-Tag: android-x86-9.0-r1~204^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=08c4871dbe6c1f5cff46d46a56f2bc82ad61d792;p=android-x86%2Fpackages-apps-Settings.git

Merge "Misc polishing fixes for Settings" into oc-mr1-dev
am: bda6500884

Change-Id: I119661153a87d0ebe67367c7350c2934679902a3
---

08c4871dbe6c1f5cff46d46a56f2bc82ad61d792