PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of a4e3842 to master

Browse Source 
Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807
This commit is contained in:
Daniel Nishi
2016-09-28 13:20:27 -07:00
parent 176478c282 a4e3842b1e
commit a2e0824b26
3 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -7903,4 +7903,7 @@
<!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]-->
<string name="domain_url_section_title">Installed apps</string>
<!-- Warning when activating the automatic storage manager on legacy devices. [CHAR LIMIT=NONE] -->
<string name="automatic_storage_manager_activation_warning">Your storage is now being managed by the storage manager</string>
</resources>