Merge \"Update Safety & Regulatory Information link text\" into nyc-mr1-dev

am: 38415ff361

Change-Id: Ica24c00e555414bdc6c60e687975add88f8c9b8e
This commit is contained in:
Matthew Fritze
2016-07-13 20:56:30 +00:00
committed by android-build-merger

View File

@@ -3059,8 +3059,8 @@
<string name="manual">Manual</string>
<!-- About phone settings screen, setting option name to show regulatory labels [CHAR LIMIT=25] -->
<string name="regulatory_labels">Regulatory labels</string>
<!-- About phone settings screen, setting option name to show safety and regulatory information [CHAR LIMIT=40] -->
<string name="safety_and_regulatory_info">Safety &amp; regulatory information</string>
<!-- About phone settings screen, setting option name to show the safety and regulatory manual [CHAR LIMIT=40] -->
<string name="safety_and_regulatory_info">Safety &amp; regulatory manual</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 copyright-related info -->
<string name="copyright_title">Copyright</string>