7 years agoImport revised translations.
Eric Fischer [Tue, 25 Oct 2011 18:29:38 +0000]
Import revised translations.

Change-Id: I114ab91f3b98b3934166a6622205eec4b8f107c0

7 years agoam 3074179d: Merge "add more logging when download manager deletes files" into ics-mr0
Doug Zongker [Tue, 18 Oct 2011 23:49:31 +0000]
am 3074179d: Merge "add more logging when download manager deletes files" into ics-mr0

* commit '3074179d22e9d7e1f506b85dca866301a6206156':
  add more logging when download manager deletes files

7 years agoMerge "add more logging when download manager deletes files" into ics-mr0
Doug Zongker [Tue, 18 Oct 2011 23:47:04 +0000]
Merge "add more logging when download manager deletes files" into ics-mr0

7 years agoMerge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 23:37:03 +0000]
Merge "Import revised translations."

7 years agoadd more logging when download manager deletes files
Doug Zongker [Tue, 18 Oct 2011 23:29:28 +0000]
add more logging when download manager deletes files

Change-Id: I4d402e28996887fc1dba89b2764575c91c2c523b

7 years agoImport revised translations.
Eric Fischer [Tue, 18 Oct 2011 22:54:05 +0000]
Import revised translations.

Change-Id: I868e251a1d1f29398ee9ae5546228d65b5059fb8

7 years agofix build break (unescaped apostrophe in string)
Doug Zongker [Tue, 18 Oct 2011 20:20:07 +0000]
fix build break (unescaped apostrophe in string)

Change-Id: I82abd3eac4f22cc7a71ad6f74335f50800b54ea2

7 years agoam 3d2ccc9f: Merge "log when DownloadManager deletes files" into ics-mr0
Doug Zongker [Tue, 18 Oct 2011 19:36:48 +0000]
am 3d2ccc9f: Merge "log when DownloadManager deletes files" into ics-mr0

* commit '3d2ccc9f61fbf6bc8a89cd373fb8a9d504faf765':
  log when DownloadManager deletes files

7 years agoMerge "log when DownloadManager deletes files" into ics-mr0
Doug Zongker [Tue, 18 Oct 2011 19:34:51 +0000]
Merge "log when DownloadManager deletes files" into ics-mr0

7 years agolog when DownloadManager deletes files
Doug Zongker [Tue, 11 Oct 2011 16:45:12 +0000]
log when DownloadManager deletes files

Change-Id: I39bcb3c7c4625659b0e8b0f3e2971beabb017b48

7 years agoam adbfa3ee: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:40:50 +0000]
am adbfa3ee: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'adbfa3eea3eb9ee0689282a3fe21d4421b2162dc':
  Import revised translations.  DO NOT MERGE

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:16:44 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Id9c8c3d750ed1eed3251a867ef3e3c4b24409899

7 years agoString edits to bring UI text to standards.
Claudia de Veaux [Mon, 17 Oct 2011 21:17:26 +0000]
String edits to bring UI text to standards.
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Change-Id: I1d7ae9b5a95d2a16a1f3d1b74076c052d2748e8d

7 years agoam c5c30ba1: NPE check before finalizeDestinationFile().
Jeff Sharkey [Mon, 17 Oct 2011 14:07:17 +0000]
am c5c30ba1: NPE check before finalizeDestinationFile().

* commit 'c5c30ba14d411b3e23c983912e7fea4f449c9f54':
  NPE check before finalizeDestinationFile().

7 years agoNPE check before finalizeDestinationFile().
Jeff Sharkey [Fri, 14 Oct 2011 20:39:55 +0000]
NPE check before finalizeDestinationFile().

Bug: 5461417
Change-Id: I16f1e8594162b006b80bf7f2cdc6630d0dedfa38

7 years agoFix test to match behavior after 5196436.
Jeff Sharkey [Thu, 13 Oct 2011 23:05:50 +0000]
Fix test to match behavior after 5196436.

Change-Id: Idfd4da891a6709504ea4f0cc72701400f63e0c2d

7 years agoMerge "Check canonical path when download requested."
Jeff Sharkey [Wed, 12 Oct 2011 19:30:46 +0000]
Merge "Check canonical path when download requested."

7 years agoCheck canonical path when download requested.
Jeff Sharkey [Wed, 12 Oct 2011 19:04:10 +0000]
Check canonical path when download requested.

Bug: 5449870
Change-Id: I3219273be9b796b123545c811e5f39fa83b5768e

7 years agolog when DownloadManager deletes files
Doug Zongker [Tue, 11 Oct 2011 16:45:12 +0000]
log when DownloadManager deletes files

Change-Id: Id4800401c16811df9c4ee78ee9636c77b4c95756

7 years agoImport revised translations.
Eric Fischer [Mon, 10 Oct 2011 18:46:33 +0000]
Import revised translations.

Change-Id: Icdad7d9cfcdcc87085094f96fffb77dee63d85ab

7 years agoImport revised translations.
Eric Fischer [Fri, 30 Sep 2011 23:48:10 +0000]
Import revised translations.

Change-Id: I32de5a902b7ed375484896fcfc3f98b51b786796

7 years agoam b395484d: Updated Download Manager launcher icon
Justin Ho [Sun, 25 Sep 2011 18:34:49 +0000]
am b395484d: Updated Download Manager launcher icon

* commit 'b395484dd0c2ecf5f15dd3aa1d55aa869c905b19':
  Updated Download Manager launcher icon

7 years agoUpdated Download Manager launcher icon
Justin Ho [Sun, 25 Sep 2011 18:26:11 +0000]
Updated Download Manager launcher icon

Change-Id: I77289d1c116105fcb0aaab8d88acb2e7c7d3c506

7 years agoam 15139db3: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 23 Sep 2011 22:44:37 +0000]
am 15139db3: (-s ours) Import revised translations.  DO NOT MERGE

* commit '15139db3842cc44d787bccc1a005b67fa76e2d27':
  Import revised translations.  DO NOT MERGE

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 23 Sep 2011 22:29:55 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I7f7f697ed9f6b69580ab8322257fc71de019f271

7 years agoam 09157020: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:43:39 +0000]
am 09157020: (-s ours) Import revised translations.  DO NOT MERGE

* commit '09157020654443be9a2f212c0956c71116d92721':
  Import revised translations.  DO NOT MERGE

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:33:57 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I4f636200a1ad8be0af727b49f5a77f927d087fa9

7 years agoImport revised translations.
Eric Fischer [Tue, 20 Sep 2011 17:42:35 +0000]
Import revised translations.

Change-Id: Ifb158e11407065cdca553239636b8cc0829c8a2a

7 years agoam 8c72a589: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 23:40:49 +0000]
am 8c72a589: (-s ours) Import revised translations.  DO NOT MERGE

* commit '8c72a589fa8cd515e0c8548395161c1607db220b':
  Import revised translations.  DO NOT MERGE

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 22:44:18 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I0581904e6a520f854c3252ba8b2650ee97c468e5

7 years agoImport revised translations.
Eric Fischer [Mon, 12 Sep 2011 16:59:39 +0000]
Import revised translations.

Change-Id: Ia3028b91ac7e9cfb5ce86983bf033871bb48d0b1

7 years agoDon't change extensions for explicitly set download locations.
Jeff Davidson [Tue, 30 Aug 2011 19:48:57 +0000]
Don't change extensions for explicitly set download locations.

This regression from GB was introduced by 38f1711910715538d6b64e505fe8fb9a0cd40475,
which was intended to allow duplicate downloads of the same file, adding -<n> to
the end of file names.  As a side effect, this also activated extension validation
logic, which adds/changes an extension to match the Mimetype.

This change keeps the unique filename logic but prevents extension changes when an
explicit filename is set.  Thus, it is still possible for the actual download
location to differ from the requested one, but only if the file already exists.

Bug: 5196436
Change-Id: I198dc2a819c5d839a05b72c25e0830d889a9c5a3

7 years agofix DownloadThread's use of ETag, range headers
Doug Zongker [Mon, 29 Aug 2011 21:19:22 +0000]
fix DownloadThread's use of ETag, range headers

DownloadThread was only maintaining ETag and the file size for the
duration of one HTTP request, rather than over all the requests needed
to fetch a file, which kind of defeats the point of having them.  Fix
this by moving several state variables from InnerState to State, and
initializing the total bytes and current bytes values from the
download database.

Skip actually making the HTTP request if we've already downloaded all
the bytes of the file.  This works around bug 5217390 by making the
second DownloadThread do nothing instead of trying to fetch past the
end of the file.  (A real fix would eliminate the race condition that
causes the second thread to get created in the first place.)

Bug: 5217390
Change-Id: Ib5b8f87398b4ed2cb3d7f09569e245b55a89da5a

7 years agoImport revised translations.
Eric Fischer [Fri, 26 Aug 2011 22:03:24 +0000]
Import revised translations.

Change-Id: I877e87e32d7c452ce7a9d1a6482c27305f777db4

7 years agoImport revised translations.
Eric Fischer [Mon, 22 Aug 2011 18:39:42 +0000]
Import revised translations.

Change-Id: I3532b37fcc54a9bd3c2bb219a769aa898ff5023b

7 years agoImport revised translations.
Eric Fischer [Sat, 13 Aug 2011 00:22:42 +0000]
Import revised translations.

Change-Id: Idddc194f3c39f757cea33543c4a124538921ec52

7 years agoMove to Notification.Builder progress API.
Jeff Sharkey [Fri, 5 Aug 2011 21:52:17 +0000]
Move to Notification.Builder progress API.

Instead of using custom layout to surface progress information, use
new Builder API.  Also use resources to build percent string.

Bug: 4022082
Change-Id: I556a666771e9103ce5d7ddb60faa879b8777b284

7 years agoImport revised translations.
Eric Fischer [Tue, 26 Jul 2011 19:08:13 +0000]
Import revised translations.

Change-Id: Icaf9c69178300f06326b98db197bdc5bd448c549

7 years agoBugfix:5033349
Dongwon Kang [Wed, 20 Jul 2011 08:04:42 +0000]
Bugfix:5033349
- Checking download data dir instread of /cache.
- Trying to remove stale files regardless of the low space thereshold.
(Note: This bug happens when download dir size is 100mb and there is a
file > 100mb in /cache.)

Change-Id: Iacded74eaadb2aa7f0af8d1b7e0f922e81c7e07c

8 years agoImport revised translations.
Eric Fischer [Fri, 15 Jul 2011 23:52:56 +0000]
Import revised translations.

Change-Id: I99a9bde045a6c327c0bf35af23a5f941e2af6853

8 years agoAdd permission to modify network accounting.
Jeff Sharkey [Tue, 12 Jul 2011 18:12:57 +0000]
Add permission to modify network accounting.

Change-Id: I2ddf1d43b8793f03d20d6c4de2f6e3b01a302ba2

8 years agoEliminate single-process mode.
Jeff Brown [Sat, 9 Jul 2011 01:53:38 +0000]
Eliminate single-process mode.
Bug: 5010576

Change-Id: I2f9bcad41cf50ed0b17dd487d0389f7b38500fd7

8 years agoImport revised translations.
Eric Fischer [Thu, 7 Jul 2011 18:50:42 +0000]
Import revised translations.

Change-Id: Ifd1ca328c4294579c8d49bef2fc7409ff0164219

8 years agoMigrate setThreadStatsTag() from String to int.
Jeff Sharkey [Sat, 25 Jun 2011 19:57:52 +0000]
Migrate setThreadStatsTag() from String to int.

Bug: 4948913
Change-Id: I831b9149208f0cc007cf3ebede3ef433b2636600

8 years agoMerge "To remove the old DRM support totally because we added the new Forward Lock...
Gloria Wang [Wed, 22 Jun 2011 20:47:19 +0000]
Merge "To remove the old DRM support totally because we added the new Forward Lock support in Download Provider."

8 years agoTo remove the old DRM support totally because we added the
Gloria Wang [Tue, 21 Jun 2011 23:18:13 +0000]
To remove the old DRM support totally because we added the
new Forward Lock support in Download Provider.

Change-Id: I71faf19527104455b666cba73a052cd0d4b7d70e

8 years agoImport revised translations.
Eric Fischer [Mon, 20 Jun 2011 22:11:03 +0000]
Import revised translations.

Change-Id: I17396116e009181cd2039be4142c6fb41199e88c

8 years agoTeach DownloadManager about network policy.
Jeff Sharkey [Wed, 15 Jun 2011 18:18:46 +0000]
Teach DownloadManager about network policy.

Now network access is determined by using getActiveNetworkInfoForUid()
which uses BLOCKED to indicate that network should be rejected for
the requesting UID.  While download in progress, watch for any policy
changes that should trigger pause.

Also check NetworkInfo.isConnected() for correctness.

Change-Id: I1efa79823f15ecc3fa088a6719da1b770c64b255

8 years agoam e021954e: (-s ours) am 76126492: am d5351de1: Import revised translations. DO...
Eric Fischer [Thu, 16 Jun 2011 16:31:38 +0000]
am e021954e: (-s ours) am 76126492: am d5351de1: Import revised translations.  DO NOT MERGE

* commit 'e021954e3d72dff35ecc091b618600b0047ec648':
  Import revised translations.  DO NOT MERGE

8 years agoam 76126492: am d5351de1: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:44:14 +0000]
am 76126492: am d5351de1: Import revised translations.  DO NOT MERGE

* commit '761264927e7888da1390e4d1abe26538c7678112':
  Import revised translations.  DO NOT MERGE

8 years agoam d5351de1: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 23:39:46 +0000]
am d5351de1: Import revised translations.  DO NOT MERGE

* commit 'd5351de1d785195474c4a0232b276acb2a2f5bda':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 15 Jun 2011 22:46:37 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Ic1471bc3b9503f5ebf8a696391413b12974f086c

8 years agoMerge "Download provider change for DRM Forward Lock plugin: to convert .dm files...
Gloria Wang [Fri, 3 Jun 2011 21:36:27 +0000]
Merge "Download provider change for DRM Forward Lock plugin: to convert .dm files to .fl files during downloading For bug 3188041"

8 years agoImport revised translations.
Eric Fischer [Thu, 26 May 2011 22:49:02 +0000]
Import revised translations.

Change-Id: I7b6a31e555f88833d0e5f16f9341d41feca02069

8 years agoReconcile with gingerbread-release honeycomb-release
The Android Open Source Project [Fri, 20 May 2011 21:14:51 +0000]
Reconcile with gingerbread-release honeycomb-release

Change-Id: I99f8eb6e9de9d63b4d7426ec3a75db9e843bffcb

8 years agoAdd Socket tagging for granular data accounting.
Jeff Sharkey [Fri, 22 Apr 2011 20:36:59 +0000]
Add Socket tagging for granular data accounting.

Tag active downloads, and account data usage towards UID that made
the original request.  Also release WakeLock only after we've cleaned
up the download.

Change-Id: I72d58c6a51beaeb357e59aae4d7c0f5ac9abaa8d

8 years agoOutput DownloadInfo state in Service.dump()
Jeff Sharkey [Tue, 12 Apr 2011 01:33:00 +0000]
Output DownloadInfo state in Service.dump()

Bug: 3136228
Change-Id: I77c4f998c9718c7630800dec152779ff59186187

8 years agoDownload provider change for DRM Forward Lock plugin:
Gloria Wang [Wed, 16 Feb 2011 19:58:51 +0000]
Download provider change for DRM Forward Lock plugin:
to convert .dm files to .fl files during downloading
For bug 3188041

Change-Id: I882b851664432fba3e57dc25a6be827b48006e69

8 years agoAllow VISIBLE_NOTIFY_COMPLETED on Request.
Jeff Sharkey [Wed, 13 Apr 2011 19:39:50 +0000]
Allow VISIBLE_NOTIFY_COMPLETED on Request.

Updates list of allowed visibility values to enable Request builders
to use Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED.

Bug: 4283223
Change-Id: I8ebe4a13f95a58f25f6025946a6d4725261717f2

8 years agoRemove the deprecated things from Config.java. These havent been working since before...
Joe Onorato [Fri, 8 Apr 2011 01:41:15 +0000]
Remove the deprecated things from Config.java. These havent been working since before 1.0.

Change-Id: Iba18a18547a161c1aa432a434b6c8f64693fb194

8 years agoMerge "Import revised translations."
Eric Fischer [Tue, 5 Apr 2011 18:22:03 +0000]
Merge "Import revised translations."

8 years agoam af128b62: (-s ours) am 4766c7f4: (-s ours) am 5c92e6b8: Import revised translation...
Eric Fischer [Tue, 5 Apr 2011 00:48:54 +0000]
am af128b62: (-s ours) am 4766c7f4: (-s ours) am 5c92e6b8: Import revised translations.  DO NOT MERGE

* commit 'af128b626b6566d378068e4b4f067b263babba69':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations.
Eric Fischer [Tue, 5 Apr 2011 00:43:46 +0000]
Import revised translations.

Change-Id: Id23ee473318bf954da1a39ea98002b956368745c

8 years agoam 4766c7f4: (-s ours) am 5c92e6b8: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 5 Apr 2011 00:42:08 +0000]
am 4766c7f4: (-s ours) am 5c92e6b8: Import revised translations.  DO NOT MERGE

* commit '4766c7f407e5cff4b53b5272bbb391e823630d5f':
  Import revised translations.  DO NOT MERGE

8 years agoam 5c92e6b8: Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 4 Apr 2011 19:21:09 +0000]
am 5c92e6b8: Import revised translations.  DO NOT MERGE

* commit '5c92e6b8f463c2fcb760f5f0343ccc137d254586':
  Import revised translations.  DO NOT MERGE

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 1 Apr 2011 20:28:30 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 31 Mar 2011 01:33:06 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam cafcbc34: (-s ours) am c3405f8a: am 67b2bc57: am e5c271f5: (-s ours) Import revise...
Eric Fischer [Tue, 29 Mar 2011 23:58:37 +0000]
am cafcbc34: (-s ours) am c3405f8a: am 67b2bc57: am e5c271f5: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'cafcbc3424489c479145bb9c5bc6e5b5a7990144':
  Import revised translations.  DO NOT MERGE

8 years agoam c3405f8a: am 67b2bc57: am e5c271f5: (-s ours) Import revised translations. DO...
Eric Fischer [Tue, 29 Mar 2011 21:15:19 +0000]
am c3405f8a: am 67b2bc57: am e5c271f5: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'c3405f8aad303044ed9776776c5f75e28f6a66ec':
  Import revised translations.  DO NOT MERGE

8 years agoam 67b2bc57: am e5c271f5: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:11:08 +0000]
am 67b2bc57: am e5c271f5: (-s ours) Import revised translations.  DO NOT MERGE

* commit '67b2bc5718c213080fc5ca2432c0403f5a63d9d6':
  Import revised translations.  DO NOT MERGE

8 years agoam e5c271f5: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:06:31 +0000]
am e5c271f5: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'e5c271f56490352121c6bd7685ad8ee69adb02c4':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 20:34:14 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Ib5cc7ad3f7c81b150ebac37a0c6e66df99ddaf2d

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 17:58:58 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Ie0f8770532d0236e882c98312a0f2017389664fd

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 23:31:29 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 12:44:09 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 26 Mar 2011 05:26:04 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 21:32:38 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 13:04:55 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 24 Mar 2011 15:49:19 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 23 Mar 2011 12:43:35 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam f879705f: (-s ours) am 80f87055: am 24b09336: Import revised translations. DO...
Eric Fischer [Tue, 22 Mar 2011 21:06:24 +0000]
am f879705f: (-s ours) am 80f87055: am 24b09336: Import revised translations.  DO NOT MERGE

* commit 'f879705f947cd4a6e1aaa9f485b6b6f184a43fb8':
  Import revised translations.  DO NOT MERGE

8 years agoam 80f87055: am 24b09336: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Mar 2011 21:04:11 +0000]
am 80f87055: am 24b09336: Import revised translations.  DO NOT MERGE

* commit '80f870551ef7a7263cefc1004e0d8269cc881a7f':
  Import revised translations.  DO NOT MERGE

8 years agoam 24b09336: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Mar 2011 21:01:34 +0000]
am 24b09336: Import revised translations.  DO NOT MERGE

* commit '24b093362a438828ef3f078485a184f2c1e1bfcd':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Mar 2011 20:40:45 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I112d6c8ce2d228f569dd724930ee1584ead1eb17

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 22 Mar 2011 20:10:43 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 22 Mar 2011 12:43:45 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 21 Mar 2011 12:42:46 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 19 Mar 2011 00:35:47 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam 65378237: (-s ours) am ad35cd75: (-s ours) am fa06ebd1: Import revised translation...
Eric Fischer [Sat, 19 Mar 2011 00:03:07 +0000]
am 65378237: (-s ours) am ad35cd75: (-s ours) am fa06ebd1: Import revised translations.  DO NOT MERGE

* commit '65378237cdc13b7ab2071367cb164eb43babdf0f':
  Import revised translations.  DO NOT MERGE

8 years agoam ad35cd75: (-s ours) am fa06ebd1: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 23:57:52 +0000]
am ad35cd75: (-s ours) am fa06ebd1: Import revised translations.  DO NOT MERGE

* commit 'ad35cd7520417b1359aa13d55188984fd54ea93d':
  Import revised translations.  DO NOT MERGE

8 years agoam fa06ebd1: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 23:52:11 +0000]
am fa06ebd1: Import revised translations.  DO NOT MERGE

* commit 'fa06ebd1c5dc8ba8c00204eab3d13b670091a5cf':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:18:08 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I47de09bd3d0e853d1b04d3ddf197b29c9b43075e

8 years agoam 387de78f: am 236726f0: bug:4128300 allow deletion of downloads in progress
Vasu Nori [Fri, 18 Mar 2011 18:57:09 +0000]
am 387de78f: am 236726f0: bug:4128300 allow deletion of downloads in progress

* commit '387de78f03b03c6a7b2a67a26141c1ce5ea2cfcb':
  bug:4128300 allow deletion of downloads in progress

8 years agoam 236726f0: bug:4128300 allow deletion of downloads in progress
Vasu Nori [Fri, 18 Mar 2011 18:53:05 +0000]
am 236726f0: bug:4128300 allow deletion of downloads in progress

* commit '236726f0ce531bb151262da20d7e43b424b5d4a6':
  bug:4128300 allow deletion of downloads in progress

8 years agobug:4128300 allow deletion of downloads in progress
Vasu Nori [Fri, 18 Mar 2011 18:03:57 +0000]
bug:4128300 allow deletion of downloads in progress

this functionality was broken when CAB was added to Downloads app

Change-Id: I00e7313650f872334d6a38dbaff7f97909e2c59c

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 18 Mar 2011 17:42:08 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoMerge "Import revised translations."
Eric Fischer [Fri, 18 Mar 2011 00:30:00 +0000]
Merge "Import revised translations."

8 years agoImport revised translations.
Eric Fischer [Thu, 17 Mar 2011 23:56:44 +0000]
Import revised translations.

Change-Id: Ia863549a0a3df0ceda71b34242a22023caeefd06

8 years agoam 32d9917c: am 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into...
Vasu Nori [Thu, 17 Mar 2011 22:41:34 +0000]
am 32d9917c: am 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1

* commit '32d9917cd4f56cabcbafa645c8cd89cd832ac523':
  bug:4121206 handle STOPSHIP comments/code

8 years agoam 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1
Vasu Nori [Thu, 17 Mar 2011 22:38:48 +0000]
am 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1

* commit '7666801aeaf7c69144ab39761156010ddbb809f7':
  bug:4121206 handle STOPSHIP comments/code