From 9ae5f517f7699439b673330867b26ffc5ad880cc Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 19 Mar 2009 23:08:57 -0700
Subject: auto import from //branches/cupcake_rel/...@141571

---
 src/com/android/providers/downloads/DownloadThread.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 9c748d5e..3cc8c22b 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -654,7 +654,7 @@ http_request_loop:
                 }
             }
             notifyDownloadCompleted(finalStatus, countRetry, retryAfter, redirectCount,
-                    gotData, filename, newUri, mInfo.mimetype);
+                    gotData, filename, newUri, mimeType);
         }
     }
 
-- 
cgit v1.2.3


From 8eb024874c8085432adba7ea7485b1369d2f0576 Mon Sep 17 00:00:00 2001
From: Eric Fischer <>
Date: Wed, 15 Apr 2009 13:30:20 -0700
Subject: AI 146365: Import revised translations.   DO NOT MERGE

Automated import of CL 146365
---
 res/values-nb/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 548d737d..774fc175 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,7 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_downloadManager">"Få tilgang til nedlasteren."</string>
-    <string name="permdesc_downloadManager">"Gir applikasjonen tilgang til nedlasteren, og å bruke den til å laste ned filer. Ondsinnede programmer kan bruke dette til å forstyrre nedlastinger og få tilgang til privat informasjon."</string>
+    <string name="permdesc_downloadManager">"Gir applikasjonen tilgang til nedlasteren, og å bruke den til å laste ned filer. Ondsinnede applikasjoner kan bruke dette til å forstyrre nedlastinger og få tilgang til privat informasjon."</string>
     <string name="permlab_downloadManagerAdvanced">"Avansert nedlastingsfunksjonalitet."</string>
     <!-- no translation found for permdesc_downloadManagerAdvanced (8761177317775872287) -->
     <skip />
-- 
cgit v1.2.3