From 22a70eee018b8b654d272209c2206938bd4d381d Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Fri, 24 Jun 2016 17:05:16 -0700
Subject: [PATCH] Add conference call label.

Used when a dialog event package contains a conference call and we need
a human readable description to assign to the caller name.

Bug: 29534470
Change-Id: Ia4aaf199430e1bac0e874327a84ce56253925e4d
---
 core/res/res/values/strings.xml | 2 ++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index ae2a9e4e1b4e1..3b51a67579f33 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4396,4 +4396,6 @@
     <!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->
     <string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>
 
+    <!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] -->
+    <string name="conference_call">Conference Call</string>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 6b7d32d25053c..e08f548c02a29 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1106,6 +1106,7 @@
   <java-symbol type="string" name="config_demoModeLauncherComponent" />
   <java-symbol type="string" name="demo_starting_message" />
   <java-symbol type="string" name="demo_restarting_message" />
+  <java-symbol type="string" name="conference_call" />
 
 
   <java-symbol type="plurals" name="bugreport_countdown" />