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/res/values-am | |
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/res/values-am')
-rw-r--r-- | java/com/android/dialer/app/res/values-am/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/java/com/android/dialer/app/res/values-am/strings.xml b/java/com/android/dialer/app/res/values-am/strings.xml index 382a62b3b..228fe94c6 100644 --- a/java/com/android/dialer/app/res/values-am/strings.xml +++ b/java/com/android/dialer/app/res/values-am/strings.xml @@ -144,7 +144,6 @@ <string name="remove_contact" msgid="2353580570488923668">"አስወግድ"</string> <string name="call_log_action_video_call" msgid="7565549950343850819">"የቪዲዮ ጥሪ"</string> <string name="call_log_action_send_message" msgid="6948727362660115554">"መልእክት ላክ"</string> - <string name="share_and_call" msgid="1208757302713705291">"ያጋሩ እና ይደውሉ"</string> <string name="call_log_action_details" msgid="2091370737371449501">"የጥሪ ዝርዝሮች"</string> <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ላክ ወደ…"</string> <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string> @@ -155,7 +154,6 @@ <string name="description_outgoing_call" msgid="543952487882919924">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g> ደውል።"</string> <string name="call_log_via_number" msgid="1340307109806397650">"በ <xliff:g id="NUMBER">%1$s</xliff:g> በኩል"</string> <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> በ <xliff:g id="NUMBER">%2$s</xliff:g> በኩል"</string> - <string name="description_call_log_call_action" msgid="6958550749492392199">"ደውል"</string> <string name="description_call_action" msgid="4042796498169106545">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string> <string name="description_video_call_action" msgid="1237090968588659650">"ቪዲዮ ጥሪ <xliff:g id="NAMEORNUMBER">^1</xliff:g>።"</string> <string name="description_voicemail_action" msgid="3290143432403538524">"የ<xliff:g id="NAMEORNUMBER">^1</xliff:g>ን የድምጽ መልዕክት ያዳምጡ"</string> |