diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-20 08:50:25 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-20 09:03:10 -0700 |
commit | 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd (patch) | |
tree | 6a0f9f0809cc02004f4be6ef9d20cbced397c3d1 /java/com/android/dialer/app/voicemail/error/res/values/strings.xml | |
parent | 9a090c89e7a0c43a668bd6e2ac5e5e680f323aed (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/150622237
Test: make, treehugger, on device testing.
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150392808 (3/16/2017) to cl/150622237 (3/20/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: Id53e0e580a4ef73760a8afb7bb8c265ee27ad535
Diffstat (limited to 'java/com/android/dialer/app/voicemail/error/res/values/strings.xml')
-rw-r--r-- | java/com/android/dialer/app/voicemail/error/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index 94d3dba11..d14652553 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -54,11 +54,11 @@ <string name="voicemail_error_inbox_full_title">Can\'t receive new voicemails</string> <string name="voicemail_error_inbox_full_message">Your inbox is full. Try deleting some messages to receive new voicemail.</string> - <string name="voicemail_error_inbox_full_turn_archive_on_title">Turn on extra storage and backup</string> - <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages.</string> + <string name="voicemail_error_inbox_full_turn_archive_on_title">[Experimental] Turn on extra storage and backup</string> + <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. <b><i>This feature is currently being tested </i></b>and will potentially delete voicemails from your voicemail server, and we do not promise to support this feature in the future. We would love your feedback though.</string> - <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Turn on extra storage and backup</string> - <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages.</string> + <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">[Experimental] Turn on extra storage and backup</string> + <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. <b><i>This feature is currently being tested </i></b>and will potentially delete voicemails from your voicemail server, and we do not promise to support this feature in the future. We would love your feedback though.</string> <string name="voicemail_error_pin_not_set_title">Set your voicemail PIN</string> <string name="voicemail_error_pin_not_set_message">You\'ll need a voicemail PIN anytime you call to access your voicemail.</string> |