From: Daniel Nishi <dhnishi@google.com>
Date: Sat, 24 Mar 2018 01:04:21 +0000 (+0000)
Subject: Merge "Add string to warn users about device name." into pi-dev
X-Git-Tag: android-x86-9.0-r1~69^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d221f7767;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add string to warn users about device name." into pi-dev
---

0d221f7767fdb325c148c37a502d3b1c6dbb7bc8