am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
  Change assist app warning message text
This commit is contained in:
Julia Reynolds
2015-07-29 18:03:57 +00:00
committed by Android Git Automerger

View File

@@ -6631,9 +6631,9 @@
<!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
displayed as a dialog message when the user selects an assistant. -->
<string name="assistant_security_warning"><xliff:g id="assistant_app_name">%s</xliff:g> will
be able to read information about apps in use on your system, including information
visible on your screen or accessible within the apps.</string>
<string name="assistant_security_warning">The assistant will be able to read information about
apps in use on your system, including information visible on your screen or accessible
within the apps.</string>
<!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
<string name="assistant_security_warning_agree">Agree</string>