From ff2ad7ffdba7c74077eae3016b32174f0f2dad30 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 27 Jul 2017 10:45:54 -0700
Subject: Update oc-dr1-dev to v11 RC17

This change updates the oc-dr1-dev branch to v11 RC17,
from the previous state synced @160679286.

This contains:
- A ROLLUP from 161342943
- Fixes for the following bugs:

Bug: 33490149 36608790 37846172 62294499
62338925 63013427 63089358 63104326
63112642 63143138 63161630 63405063
63415147 63450835 63494010 63522618
63523694 63523776 63524435 63575857
63594129 63634700 63642638 63643370
63709810 63710739 63716219 63757003
64009408 64025042 64060628 64073371

Test: make

Merged-In: I69ba6cbadbd1a02f05405ca0f5273b0a5ea0e5e9
Change-Id: Iaad73fa51796f62f4947571ddb744bbdadcca64e
---
 .../incallui/disconnectdialog/res/values-da/strings.xml      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'java/com/android/incallui/disconnectdialog/res/values-da/strings.xml')

diff --git a/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
index dae242699..817226eeb 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
@@ -17,12 +17,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for incall_enable_wifi_calling_button (3295230556186542328) -->
-    <skip />
-    <!-- no translation found for video_call_not_available_title (987490011944013201) -->
-    <skip />
-    <!-- no translation found for video_call_not_available_message (2284146863894603221) -->
-    <skip />
-    <!-- no translation found for voice_call (6748636104112578475) -->
-    <skip />
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivér"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Det er ikke muligt at foretage videoopkald i øjeblikket"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv at ringe igen senere, eller fortsæt med et taleopkald."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Taleopkald"</string>
 </resources>
-- 
cgit v1.2.3