From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 6 Apr 2017 09:41:50 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/152373142.

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/151342913 (3/27/2017) to cl/152373142 (4/06/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: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
---
 java/com/android/incallui/res/values-nb/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'java/com/android/incallui/res/values-nb')

diff --git a/java/com/android/incallui/res/values-nb/strings.xml b/java/com/android/incallui/res/values-nb/strings.xml
index 52ff32a10..bb2cf692d 100644
--- a/java/com/android/incallui/res/values-nb/strings.xml
+++ b/java/com/android/incallui/res/values-nb/strings.xml
@@ -37,6 +37,23 @@
     <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
+    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
+    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Innkommende anrop med melding"</string>
+    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Innkommende anrop med posisjon"</string>
+    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Innkommende anrop med bilde og melding"</string>
+    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Innkommende anrop med bilde og posisjon"</string>
+    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Innkommende anrop med melding og posisjon"</string>
+    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Innkommende anrop med bilde, melding og posisjon"</string>
+    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Innkommende anrop med vedlegg"</string>
+    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktig innkommende anrop"</string>
+    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktig innkommende anrop med bilde"</string>
+    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktig innkommende anrop med melding"</string>
+    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktig innkommende anrop med posisjon"</string>
+    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktig innkommende anrop med bilde og melding"</string>
+    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktig innkommende anrop med bilde og posisjon"</string>
+    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktig innkommende anrop med melding og posisjon"</string>
+    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
+    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
     <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
     <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
-- 
cgit v1.2.3