Merge "Require password to FR in carrier demo mode"

Bug: 34341567
Test: manual - still builds
Change-Id: Ie450a97db5c3ce58a1a5e43334bb0546a3c48645
This commit is contained in:
Christine Franks
2017-01-23 17:19:13 -08:00
parent 4bd54c70fa
commit cf683142cf

View File

@@ -893,4 +893,11 @@
<!-- Label for Greenwich mean time, used in a string like GMT+05:00. [CHAR LIMIT=NONE] -->
<string name="time_zone_gmt">GMT</string>
<!-- Label for carrier demo mode factory reset confirmation dialog. [CHAR LIMIT=NONE] -->
<string name="retail_demo_reset_message">Enter password to perform factory reset in demo mode</string>
<!-- Label for positive button on carrier demo mode factory reset confirmation dialog [CHAR LIMIT=40] -->
<string name="retail_demo_reset_next">Next</string>
<!-- Title for carrier demo mode factory reset confirmation dialog. [CHAR LIMIT=40] -->
<string name="retail_demo_reset_title">Password required</string>
</resources>