commit 7245bbb3d586537f030a67971299974d80e5752b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jan 29 18:23:45 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 29 18:23:45 2018 +0000
tree 91cf06194a056558cdd2b5b94ade095e558c8914
parent 9024b4eb1552754f29fd390545eb1b3d29dece11
parent d341d86850e6f866ceac811ec1acb3e116dfc08e

Merge "Readd needed string"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1f40af..f917d81 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8777,6 +8777,9 @@
     <!-- [CHAR LIMIT=25] Title of developer tile to toggle layer trace -->
     <string name="layer_trace_quick_settings_title">Surface Trace</string>
 
+    <!-- Template for formatting country and language. eg Canada - French [CHAR LIMIT=NONE]-->
+    <string name="support_country_format"><xliff:g id="country" example="Canada">%1$s</xliff:g> - <xliff:g id="language" example="French">%2$s</xliff:g></string>
+
     <!-- [CHAR LIMIT=60] Title of work profile setting page -->
     <string name="managed_profile_settings_title">Work profile settings</string>
     <!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->