Merge changes I06c1bc14,I5415b8ed into qt-dev

* changes:
  Clean up a STOPSHIP string
  Fix view overlap in wifi dpp enrollment.
This commit is contained in:
TreeHugger Robot
2019-05-17 22:41:26 +00:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 8 deletions

View File

@@ -8967,12 +8967,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>