Update AOSP Dialer source from internal google3 repository at

cl/151128062

Test: make, treehugger

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/150756069 (3/21/2017) to cl/151128062 (3/24/2017).

Notable this release:
- Explicitly enumerate host and target dependencies.
- Update proguard flag references.

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.

Bug: 33210202 36511925

Addresses
33210202 - Proguard support
36511925 - Compiler warnings when building against platform sdk

Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae

1 files changed, 5 insertions, 0 deletions

diff --git a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
index d4e971b0c..7e573071d 100644
--- a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
@@ -3,6 +3,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"アイコンをスワイプして着信を拒否し、メッセージを送信"</string>
     <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"アイコンをスワイプして音声通話として応答"</string>
+    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"上にスワイプして通話に応答し、進行中の通話を保留"</string>
+    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"上にスワイプして通話に応答し、保留中の通話を終了"</string>
+    <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"アイコンをスワイプして着信中の通話に応答し、進行中の通話を終了"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"カスタム返信を作成…"</string>
     <string name="call_incoming_audio_handset" msgid="2299009191401671619">"ハンドセット"</string>
     <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"スピーカーフォン"</string>
@@ -11,8 +14,10 @@
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"送信"</string>
     <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"この着信を拒否してメッセージを送信"</string>
     <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"音声通話として応答"</string>
+    <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"着信中の通話に応答し、進行中の通話を終了"</string>
     <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒否してメッセージを送信"</string>
     <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"音声通話として応答"</string>
+    <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"着信中の通話に応答し、進行中の通話を終了"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ビデオ: OFF"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"応答するには 2 本の指で上にスワイプ、拒否するには 2 本の指で下にスワイプします。"</string>
     <string name="call_incoming_important" msgid="6477906345540334049">"重要な通話"</string>