Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Add conference call label.\" into nyc-mr1-dev

Browse Source 
am: 9e0450a4e3

Change-Id: I360791bda03611f55cdd31aa899465644e9901ef
This commit is contained in:
Tyler Gunn
2016-06-30 02:46:13 +00:00
committed by android-build-merger
parent 4ffaa76089 9e0450a4e3
commit cb48998883
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -1107,6 +1107,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" />