am c344ba3a: am cfcdcb84: Merge "Restore deleted string still referenced from a layout." into honeycomb

* commit 'c344ba3aee67c07e6a6740409fc2d3f3615f40bb':
  Restore deleted string still referenced from a layout.
This commit is contained in:
Eric Fischer
2011-01-24 14:01:06 -08:00
committed by Android Git Automerger

View File

@@ -2886,6 +2886,7 @@ found in the list of installed applications.</string>
<string name="credentials_reset_hint">All the contents will be removed, and the password will be reset. Are you sure about that?</string>
<!-- Error message [CHAR LIMIT=NONE] -->
<string name="credentials_passwords_mismatch">Passwords do not match.</string>
<string name="credentials_password_too_short">The password must have at least 8 characters.</string>
<!-- Error message [CHAR LIMIT=NONE] -->
<string name="credentials_wrong_password">Incorrect password.</string>
<!-- Error message [CHAR LIMIT=NONE] -->