diff options
| author | Maurice Chu <mochu@google.com> | 2012-04-23 19:06:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-23 19:06:09 -0700 |
| commit | 88fffb7a34313d5e94b3974d444d07bd6a4879a4 (patch) | |
| tree | 99cb2129186cd2e01137ca5b18e95608e8fcff41 | |
| parent | 8b482446683e4908e6a71da42301291a0a399932 (diff) | |
| parent | 2dfba0e6cffc6f8ba5c109857c3192bcd85bd174 (diff) | |
| download | frameworks_base-88fffb7a34313d5e94b3974d444d07bd6a4879a4.zip frameworks_base-88fffb7a34313d5e94b3974d444d07bd6a4879a4.tar.gz frameworks_base-88fffb7a34313d5e94b3974d444d07bd6a4879a4.tar.bz2 | |
Merge "Fix build breakage resulting from change id: Ia1038f45"
| -rwxr-xr-x | core/res/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9a16521..a589015 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -960,14 +960,14 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_readContacts" product="tablet">Allows the app to read all the data about your contacts stored on your tablet, including the frequency - with which you've called, emailed, or communicated in other ways with specific + with which you\'ve called, emailed, or communicated in other ways with specific individuals. This helps with auto-completion of email addresses and other convenient features. Malicious apps can use this permission to send your contact data to other people.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_readContacts" product="default">Allows the app to read all the data about your contacts stored on your phone, including the frequency - with which you've called, emailed, or communicated in other ways with specific + with which you\'ve called, emailed, or communicated in other ways with specific individuals. This helps with auto-completion of email addresses and other convenient features. Malicious apps can use this permission to send your contact data to other people.</string> @@ -977,13 +977,13 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_writeContacts" product="tablet">Allows the app to modify the data about your contacts stored on your tablet, including the frequency - with which you've called, emailed, or communicated in other ways with specific + with which you\'ve called, emailed, or communicated in other ways with specific individuals. This helps with auto-completion of email addresses and other convenient features. Malicious apps may use this to erase or modify your contact data.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_writeContacts" product="default">Allows the app to modify the data about your contacts stored on your phone, including the frequency - with which you've called, emailed, or communicated in other ways with specific + with which you\'ve called, emailed, or communicated in other ways with specific individuals. This helps with auto-completion of email addresses and other convenient features. Malicious apps may use this to erase or modify your contact data.</string> |