Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: bc58c1f129

am: b8ac55aec0

Change-Id: I1594f80c15fd663c706164384c463633eedea264
This commit is contained in:
Fan Zhang
2019-05-17 21:57:36 -07:00
committed by android-build-merger
3 changed files with 3 additions and 8 deletions

View File

@@ -8969,12 +8969,6 @@
<!-- Title for Default Phone app settings [CHAR LIMIT=30] -->
<string name="default_phone_title">Phone app</string>
<!--
~ STOPSHIP(b/110557011): Remove once the new UI is ready.
-->
<!-- Title for Roles settings [CHAR LIMIT=30] -->
<string name="roles_title">Roles</string>
<!-- Label of default app for current setting [CHAR LIMIT=40] -->
<string name="default_app">(Default)</string>