Merge "Accounts -> Account sync" into mnc-dev

This commit is contained in:
Jason Monk
2015-06-09 19:50:11 +00:00
committed by Android (Google) Code Review

View File

@@ -724,11 +724,11 @@
<!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
<string name="profile_info_settings_title">Profile info</string>
<!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
<string name="Accounts_settings_title">Accounts</string>
<string name="Accounts_settings_title">Account sync</string>
<!-- Main Settings screen setting option title for the item to take you to the location screen -->
<string name="location_settings_title">Location</string>
<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
<string name="account_settings_title">Accounts</string>
<string name="account_settings_title">Account sync</string>
<!-- Main Settings screen setting option title for the item to take you to the security screen -->
<string name="security_settings_title">Security</string>
<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->