Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f7d73be authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge \\"Add conference call label.\\" into nyc-mr1-dev am: 9e0450a4 

am: cb489988

Change-Id: Ic21fb1176afd363623245ea3d30bebeec81aea1f
parents 07ccf49f cb489988

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4398,4 +4398,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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,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" />