resolve merge conflicts of d30af7c to master

Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
This commit is contained in:
Andreas Gampe
2016-08-30 20:22:02 -07:00
5 changed files with 289 additions and 45 deletions

View File

@@ -7810,4 +7810,16 @@
<!-- Used as wall of text to describe the feature. [CHAR LIMIT=NONE] -->
<string name="downloads_backup_text"></string>
<!-- Title text for enabling web actions. [CHAR_LIMIT=60] -->
<string name="web_action_enable_title">Open links in apps</string>
<!-- Summary text for enabling web actions. [CHAR_LIMIT=250] -->
<string name="web_action_enable_summary">Open links in supported apps, even if the
apps arent installed on your device</string>
<!-- Section title for the Web Action preference [CHAR LIMIT=60] -->
<string name="web_action_section_title">Apps not installed</string>
<!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]-->
<string name="domain_url_section_title">Installed apps</string>
</resources>