Merge "Fix build breakage resulting from change id: Ia1038f45"

Author: Maurice Chu

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>