Merge "Add string for module license." into qt-dev am: 05ee8ba830

am: 935eac5c7f

Change-Id: I4366da3dc3205c78eae265ae24354a8a07e019bf
This commit is contained in:
Andrew Sapperstein
2019-06-17 19:59:31 -07:00
committed by android-build-merger

View File

@@ -3981,6 +3981,9 @@
<!-- About phone settings screen, setting option name to see licensing info --> <!-- About phone settings screen, setting option name to see licensing info -->
<string name="license_title">License</string> <string name="license_title">License</string>
<!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip /> <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
<!-- About phone settings screen, setting option name to see licensing info for Google Play system updates [CHAR LIMIT=50] -->
<string name="module_license_title">Google Play system update licenses</string>
<!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
<!-- About phone settings screen, setting option name to see terms and conditions --> <!-- About phone settings screen, setting option name to see terms and conditions -->
<string name="terms_title">Terms and conditions</string> <string name="terms_title">Terms and conditions</string>
<!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip /> <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />