Merge "Add a string message for Private DNS strict mode failure" into pi-dev

author Erik Kline <ek@google.com>

Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)
author Erik Kline <ek@google.com>
Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)
diff --cc packages/SettingsLib/res/values/strings.xml
Simple merge
author	Erik Kline <ek@google.com>
	Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)