From: Fan Zhang <zhfan@google.com>
Date: Fri, 23 Mar 2018 01:07:28 +0000 (+0000)
Subject: Merge "Misc string updates" into pi-dev am: 4aa9d5d2b4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=da8e3cddaa3645b42831599adbb638e9842b463a;p=android-x86%2Fpackages-apps-Settings.git

Merge "Misc string updates" into pi-dev am: 4aa9d5d2b4
am: 015c57a38e

Change-Id: I3ae44469dd99527af2464aaeac3d56fb2bd06c64
---

da8e3cddaa3645b42831599adbb638e9842b463a