7 years agoLocking around downloads, and more dump info.
Jeff Sharkey [Fri, 13 Apr 2012 19:34:18 +0000]
Locking around downloads, and more dump info.

Bug: 4997552
Change-Id: I3c612acb5145a7638c9345a376a99958851a0891

7 years agoGive DownloadManager a useful user agent.
Jeff Sharkey [Fri, 6 Apr 2012 23:11:18 +0000]
Give DownloadManager a useful user agent.

Include platform version, model, and build, when available.  Matches
current logic used by Browser.

Bug: 6257336
Change-Id: I0addfd944aff13bd4ce4226bb8d6328da6b0f5d5

7 years agoMove to new NetworkPolicyManager accessor.
Jeff Sharkey [Thu, 5 Apr 2012 23:40:23 +0000]
Move to new NetworkPolicyManager accessor.

Change-Id: I21e5f6280748529bad881942f8f5534aa374ba55

7 years agoMigrate to shared MockWebServer.
Jeff Sharkey [Thu, 29 Mar 2012 20:38:24 +0000]
Migrate to shared MockWebServer.

Bug: 4726601
Change-Id: Ibe537bd5c2a092dbf974360cd454751881f7f4ea

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 27 Mar 2012 18:09:36 +0000]
Import translations. DO NOT MERGE

Change-Id: If1d8435e21fcfaf8d9d742f3077333fc1d45137f

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 23 Mar 2012 18:36:38 +0000]
Import translations. DO NOT MERGE

Change-Id: I472ad4749ceeaa967f4fd7ba2fdf2cfb5e97509a

7 years agoMerge remote-tracking branch 'goog/ics-aah-exp'
Mike Lockwood [Wed, 21 Mar 2012 23:41:45 +0000]
Merge remote-tracking branch 'goog/ics-aah-exp'

empty -s ours merge

Change-Id: I6cfeced57f7c36e771b349f65a1a3e13e199890e

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 8 Mar 2012 19:14:18 +0000]
Import translations. DO NOT MERGE

Change-Id: I4e78ced9628cd22fb59a17749f2ac9ce75ddbf73

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 7 Mar 2012 19:38:14 +0000]
Import translations. DO NOT MERGE

Change-Id: I7df2d63cc2c51b79d98b4889687a8035453d125e

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 6 Mar 2012 19:20:05 +0000]
Import translations. DO NOT MERGE

Change-Id: I0ac6da326a7a4d15acc84d0301688ca2f4a6ed9a

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 5 Mar 2012 20:47:43 +0000]
Import translations. DO NOT MERGE

Change-Id: I3c6cda860dbf7574608e79cc36d481d5c7f75565

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 2 Mar 2012 19:38:57 +0000]
Import translations. DO NOT MERGE

Change-Id: I7069f3d2be0bb43238df3ce3dc585f7b9a9edb53

7 years agoam 50c85944: Match INetworkPolicyListener changes.
Jeff Sharkey [Wed, 8 Feb 2012 00:43:35 +0000]
am 50c85944: Match INetworkPolicyListener changes.

* commit '50c85944bf5e949ad5116fec9564318b3be90f24':
  Match INetworkPolicyListener changes.

7 years agoMatch INetworkPolicyListener changes.
Jeff Sharkey [Wed, 8 Feb 2012 00:23:25 +0000]
Match INetworkPolicyListener changes.

Change-Id: I78b6b0380a42b28f42334f93e0538ba7f32bc66d

7 years agoam dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:09:58 +0000]
am dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release

* commit 'dc8940b538a2261e0f0dbf027362cc1c359c7cd6':

7 years agoam 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:06:14 +0000]
am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release

* commit '71d3ff5dd317c5957f1f6b0cc877a3fceabbb445':

7 years agoam 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:01:13 +0000]
am 55231bc5: Reconcile with ics-mr1-release

* commit '55231bc588e71c23f9d6ac5a94e72e96c3825991':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 16:50:49 +0000]
Reconcile with ics-mr1-release

Change-Id: Ibd173b02bfba0a495cd0ec5df37154c269c87b91

7 years agoam 2404bcad: Import translations. DO NOT MERGE
Eric Fischer [Tue, 31 Jan 2012 00:02:18 +0000]
am 2404bcad: Import translations. DO NOT MERGE

* commit '2404bcadf297cb87254a27982f374bb86b1c74cf':
  Import translations. DO NOT MERGE

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Jan 2012 23:01:06 +0000]
Import translations. DO NOT MERGE

Change-Id: I28f97070ecefc2538afa0ab4eddad99628b60286

7 years agoam 515cf53e: Move away from deprecated NetworkInfo extra.
Jeff Sharkey [Mon, 30 Jan 2012 19:53:32 +0000]
am 515cf53e: Move away from deprecated NetworkInfo extra.

* commit '515cf53eb94b8873aa6a1edcd6a962f0b0ca2170':
  Move away from deprecated NetworkInfo extra.

7 years agoMove away from deprecated NetworkInfo extra.
Jeff Sharkey [Mon, 30 Jan 2012 19:16:44 +0000]
Move away from deprecated NetworkInfo extra.

Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast
extra does not reflect the state applicable to the calling UID, and
the last sticky broadcast may have stale state, transition to calling
ConnectivityManager.getActiveNetworkInfo() directly.

Change-Id: Ie7a143e621e5a3a013ec6d8b8613709e7787dc0c

7 years agoam b1a4b7d4: Import translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 22:00:51 +0000]
am b1a4b7d4: Import translations. DO NOT MERGE

* commit 'b1a4b7d41bcc5c89e1123ff0b031efe45512519f':
  Import translations. DO NOT MERGE

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 21:57:07 +0000]
Import translations. DO NOT MERGE

Change-Id: If9cd930e2e9c04bc1a3120992811f0b0e88a927a

7 years agoam ac71f70c: Update DownloadProvider for new Intent.normalizeMimeType() API.
Nick Pelly [Wed, 25 Jan 2012 21:28:37 +0000]
am ac71f70c: Update DownloadProvider for new Intent.normalizeMimeType() API.

* commit 'ac71f70c31f38d5f99e5d3bb06ea08cdf107b948':
  Update DownloadProvider for new Intent.normalizeMimeType() API.

7 years agoUpdate DownloadProvider for new Intent.normalizeMimeType() API.
Nick Pelly [Mon, 9 Jan 2012 22:11:53 +0000]
Update DownloadProvider for new Intent.normalizeMimeType() API.

Change-Id: Ideeb8cbeaa4b4d82d7c9fc8197a35bf3541a22d7

7 years agoam ca11088a: am 3ddc6cc0: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 08:42:17 +0000]
am ca11088a: am 3ddc6cc0: Reconcile with ics-mr1-release

* commit 'ca11088a57d3066408fb35d30551a0fc743a17a3':

7 years agoam 3ddc6cc0: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:18:41 +0000]
am 3ddc6cc0: Reconcile with ics-mr1-release

* commit '3ddc6cc0e16136d863df51a8e0e36b0558dcde62':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:15:49 +0000]
Reconcile with ics-mr1-release

Change-Id: Ia5f0f8633b530dd4f551be4776206639b926fc18

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 7 Jan 2012 00:32:55 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam 23bb4b4f: am 380044a2: am f720bc68: Allow downloads when no network restriction...
Jeff Sharkey [Fri, 6 Jan 2012 22:28:47 +0000]
am 23bb4b4f: am 380044a2: am f720bc68: Allow downloads when no network restriction set.

* commit '23bb4b4fb4076d09959b35f3e1247941ef7066c2':
  Allow downloads when no network restriction set.

7 years agoam 380044a2: am f720bc68: Allow downloads when no network restriction set.
Jeff Sharkey [Fri, 6 Jan 2012 22:25:59 +0000]
am 380044a2: am f720bc68: Allow downloads when no network restriction set.

* commit '380044a236ffba16a800cb683fa648860dcfd573':
  Allow downloads when no network restriction set.

7 years agoam f720bc68: Allow downloads when no network restriction set.
Jeff Sharkey [Fri, 6 Jan 2012 22:23:28 +0000]
am f720bc68: Allow downloads when no network restriction set.

* commit 'f720bc684b1a8332eb4d5f8d25c5feaf7eb54433':
  Allow downloads when no network restriction set.

7 years agoam f720bc68: Allow downloads when no network restriction set.
Jeff Sharkey [Fri, 6 Jan 2012 22:22:58 +0000]
am f720bc68: Allow downloads when no network restriction set.

* commit 'f720bc684b1a8332eb4d5f8d25c5feaf7eb54433':
  Allow downloads when no network restriction set.

7 years agoAllow downloads when no network restriction set.
Jeff Sharkey [Thu, 5 Jan 2012 22:37:51 +0000]
Allow downloads when no network restriction set.

Fixes bug where DownloadManager would block downloads on WiMAX,
bluetooth, and ethernet networks, even when no network restrictions
had been set.

Bug: 5689335
Change-Id: I6d1bb78cbccb3c5eb1fce40a13b0689be0c3fa13

7 years agoam b1d7241f: Import revised translations.
Eric Fischer [Thu, 29 Dec 2011 23:09:18 +0000]
am b1d7241f: Import revised translations.

* commit 'b1d7241fb2f193350901c8f23b94d32800857837':
  Import revised translations.

7 years agoImport revised translations.
Eric Fischer [Thu, 29 Dec 2011 21:58:19 +0000]
Import revised translations.

Change-Id: Ic00709623c5be406b3f83000ff821860af754b71

7 years agoam a67beb7a: am 13a08957: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 9 Dec 2011 23:03:33 +0000]
am a67beb7a: am 13a08957: Reconcile with ics-mr1-release

* commit 'a67beb7a4c2cec6ebaed61bc64157a9138812f9e':

7 years agoam 13a08957: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 9 Dec 2011 22:57:43 +0000]
am 13a08957: Reconcile with ics-mr1-release

* commit '13a089576461d61a49e6770c41faa9afcdcc8816':

7 years agoam f774814b: Merge "Use UID instead of PID."
Jeff Sharkey [Thu, 8 Dec 2011 20:09:42 +0000]
am f774814b: Merge "Use UID instead of PID."

* commit 'f774814bc9397d9b598593689c84770c35dc3248':
  Use UID instead of PID.

7 years agoMerge "Use UID instead of PID."
Jeff Sharkey [Thu, 8 Dec 2011 20:07:38 +0000]
Merge "Use UID instead of PID."

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 8 Dec 2011 18:22:21 +0000]
Reconcile with ics-mr1-release

Change-Id: I994f92ebc9d80a912db2c4f1aa9100ba94daad5f

7 years agoam 4fded8cf: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 30 Nov 2011 22:05:02 +0000]
am 4fded8cf: Reconcile with ics-mr1-release

* commit '4fded8cfdd2bed314c5238003cdaf974be6246e9':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 30 Nov 2011 20:56:21 +0000]
Reconcile with ics-mr1-release

Change-Id: Icd5311e1b9183fbbfd51d05f6fc1719037528e3c

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 30 Nov 2011 14:47:05 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam a318a7fc: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 22:30:25 +0000]
am a318a7fc: Import revised translations.  DO NOT MERGE

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

7 years agoam 388c3a1b: am a318a7fc: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:36:09 +0000]
am 388c3a1b: am a318a7fc: (-s ours) Import revised translations.  DO NOT MERGE

* commit '388c3a1b8cced74dc4c23e03881a2dc861e1e4c0':
  Import revised translations.  DO NOT MERGE

7 years agoam a318a7fc: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:32:39 +0000]
am a318a7fc: (-s ours) Import revised translations.  DO NOT MERGE

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

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:19:52 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I8037964fb975a4ba0490449373e7be080c3411c6

7 years agoam 3f4471c8: Import revised translations.
Eric Fischer [Tue, 29 Nov 2011 19:54:05 +0000]
am 3f4471c8: Import revised translations.

* commit '3f4471c8a4e348e5c53e5a2c317cd7c41dd5790e':
  Import revised translations.

7 years agoImport revised translations.
Eric Fischer [Tue, 29 Nov 2011 19:25:32 +0000]
Import revised translations.

Change-Id: I941c6fa19e313eece87561537c85706c5976f0f5

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 28 Nov 2011 20:23:18 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam ea2feafc: am fd849573: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Nov 2011 05:12:25 +0000]
am ea2feafc: am fd849573: (-s ours) Import revised translations. DO NOT MERGE

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

7 years agoam fd849573: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Nov 2011 05:07:51 +0000]
am fd849573: (-s ours) Import revised translations. DO NOT MERGE

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

7 years agoam fd849573: Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:16:36 +0000]
am fd849573: Import revised translations. DO NOT MERGE

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

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:03:29 +0000]
Import revised translations. DO NOT MERGE

Change-Id: Icfdd04948a2e7d4d6de4b79b7d0cfe44106100a1

7 years agoam f1c794aa: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 18 Nov 2011 23:46:31 +0000]
am f1c794aa: Reconcile with ics-mr1-release

* commit 'f1c794aae7980595f15efd8398ae3148e8ed154f':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 18 Nov 2011 23:43:44 +0000]
Reconcile with ics-mr1-release

Change-Id: I5a17b2bdb6c727bb3bc6fcfcb378ef3557ad0883

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:47:30 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam 08dffa74: am c76eb5fa: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Nov 2011 13:54:57 +0000]
am 08dffa74: am c76eb5fa: (-s ours) Import revised translations. DO NOT MERGE

* commit '08dffa7432868059425df0ce657febc9632c464f':
  Import revised translations. DO NOT MERGE

7 years agoam c76eb5fa: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Nov 2011 13:46:19 +0000]
am c76eb5fa: (-s ours) Import revised translations. DO NOT MERGE

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

7 years agoam c76eb5fa: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 21:29:08 +0000]
am c76eb5fa: Import revised translations. DO NOT MERGE

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

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 21:10:27 +0000]
Import revised translations. DO NOT MERGE

Change-Id: I8808da2bd48c0f91584ef716c4882ee9ce1f38d3

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:47:06 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam 2334a1b5: am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO...
Eric Fischer [Tue, 15 Nov 2011 22:37:09 +0000]
am 2334a1b5: am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE

* commit '2334a1b5c24444365c31198d9bd2b1acae753178':
  Import revised translations. DO NOT MERGE

7 years agoam 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 22:34:52 +0000]
am 0fe3c81d: (-s ours) am 8ed79f16: Import revised translations. DO NOT MERGE

* commit '0fe3c81d681ce35ef7506aa9d60d390305cad8be':
  Import revised translations. DO NOT MERGE

7 years agoam 0fe3c81d: am 8ed79f16: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 22:33:21 +0000]
am 0fe3c81d: am 8ed79f16: Import revised translations. DO NOT MERGE

* commit '0fe3c81d681ce35ef7506aa9d60d390305cad8be':
  Import revised translations. DO NOT MERGE

7 years agoam 8ed79f16: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 22:30:45 +0000]
am 8ed79f16: Import revised translations. DO NOT MERGE

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

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Nov 2011 21:34:29 +0000]
Import revised translations. DO NOT MERGE

Change-Id: Ia56a0446aef9b293d86936aaf1a1399fc977a433

7 years agoam f9ea94db: Edits to strings to use UI text standards. * We use contractions now...
Claudia de Veaux [Fri, 11 Nov 2011 23:59:09 +0000]
am f9ea94db: Edits to strings to use UI text standards. * We use contractions now. * We avoid using forms of "fail". Bug: 5165745 Bug: 5162667

* commit 'f9ea94dbeedcdd37895aced9c0578107e58c8ef3':
  Edits to strings to use UI text standards. * We use contractions now. * We avoid using forms of "fail". Bug: 5165745 Bug: 5162667

7 years agoUse UID instead of PID.
Jeff Sharkey [Fri, 11 Nov 2011 20:37:21 +0000]
Use UID instead of PID.

Bug: 5606426
Change-Id: I9b9cee142c360da2a30a4bb8be8dcf40b8c7e43e

7 years agoEdits to strings to use UI text standards.
Claudia de Veaux [Thu, 10 Nov 2011 21:42:49 +0000]
Edits to strings to use UI text standards.
* We use contractions now.
* We avoid using forms of "fail".
Bug: 5165745
Bug: 5162667

Change-Id: Iae9098cbb37e78f94204c34137c87ed46425879e

7 years agomake DownloadManager download over ethernet - do not merge
Doug Zongker [Thu, 10 Nov 2011 18:17:59 +0000]
make DownloadManager download over ethernet - do not merge

This makes DownloadManager treat an ethernet connection like a wifi
one.  Will be okay for aah; fixing properly requires a DownloadManager
API change that we're not sure is allowed at this point.

Change-Id: Ie03479d334f5e09bd7a91f2998fc4b1f77b95e6a

7 years agoam e0d2219d: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 4 Nov 2011 15:35:43 +0000]
am e0d2219d: Reconcile with ics-mr1-release

* commit 'e0d2219da3d9a9026fb1239a3910a5cf171c59f9':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 4 Nov 2011 15:31:44 +0000]
Reconcile with ics-mr1-release

Change-Id: I4ab631975f37b55373c39321246db6892aec0cbe

7 years agoam 14d303fe: Merge "Import revised translations."
Eric Fischer [Wed, 2 Nov 2011 21:12:30 +0000]
am 14d303fe: Merge "Import revised translations."

* commit '14d303fe1e754d994ee82839c73dd037ac76e0c3':
  Import revised translations.

7 years agoMerge "Import revised translations."
Eric Fischer [Wed, 2 Nov 2011 21:09:32 +0000]
Merge "Import revised translations."

7 years agoam 1e183d1a: (-s ours) am 53333438: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Wed, 2 Nov 2011 17:52:19 +0000]
am 1e183d1a: (-s ours) am 53333438: (-s ours) Import revised translations.  DO NOT MERGE

* commit '1e183d1a28d6d8c0f170d7850487c8b08b1eb393':
  Import revised translations.  DO NOT MERGE

7 years agoImport revised translations.
Eric Fischer [Wed, 2 Nov 2011 17:47:34 +0000]
Import revised translations.

Change-Id: I5a01b1c23147ad064ce1ae02fd3e06b3bb3082fc

7 years agoam 53333438: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 17:31:24 +0000]
am 53333438: (-s ours) Import revised translations.  DO NOT MERGE

* commit '53333438f95f817d48b7308c694a668c819cb0a4':
  Import revised translations.  DO NOT MERGE

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 2 Nov 2011 13:46:59 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam 53333438: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Nov 2011 20:53:17 +0000]
am 53333438: Import revised translations.  DO NOT MERGE

* commit '53333438f95f817d48b7308c694a668c819cb0a4':
  Import revised translations.  DO NOT MERGE

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Nov 2011 20:38:24 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I41cac0aeb387bcf15c13cc5971ee0a4cf46a7b9e

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 31 Oct 2011 20:19:37 +0000]
Reconcile with ics-mr1-release

Change-Id: I1746d39ab2f48b064aec9fc11f546dd74c48a57f

7 years agoMerge remote branch 'goog/ics-mr1' into ics-aah
Ed Heyl [Mon, 31 Oct 2011 12:54:48 +0000]
Merge remote branch 'goog/ics-mr1' into ics-aah

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 30 Oct 2011 13:48:12 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoMerge "Import revised translations."
Eric Fischer [Fri, 28 Oct 2011 19:17:16 +0000]
Merge "Import revised translations."

7 years agokeep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Ed Heyl [Fri, 28 Oct 2011 19:05:58 +0000]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)

7 years agoImport revised translations.
Eric Fischer [Fri, 28 Oct 2011 18:40:52 +0000]
Import revised translations.

Change-Id: I4e62acdab15be65fc2c0e88493e5b7bcf102adaa

7 years agoam 219a3de8: (-s ours) am aed71cf0: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Thu, 27 Oct 2011 21:54:06 +0000]
am 219a3de8: (-s ours) am aed71cf0: (-s ours) Import revised translations.  DO NOT MERGE

* commit '219a3de8789c3ffb25fc52f5679abbadff26fd7c':
  Import revised translations.  DO NOT MERGE

7 years agoam aed71cf0: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 21:46:51 +0000]
am aed71cf0: (-s ours) Import revised translations.  DO NOT MERGE

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

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:54:14 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I374bd941c768d24f14c73c1a3fe10f9130a85e37

7 years agoam 025b6a7c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 16:51:02 +0000]
am 025b6a7c: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '025b6a7c21fce053e5cdbfee393fcd6472e38e64':
  Import revised translations.  DO NOT MERGE

7 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 16:46:11 +0000]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 27 Oct 2011 13:47:58 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 00:41:09 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I3b4ef91d72729bea21ad384b11f44f61de4f36bf

7 years agoundo reset to ics-mr1 until we have a better method
Ed Heyl [Wed, 26 Oct 2011 21:53:27 +0000]
undo reset to ics-mr1 until we have a better method

7 years agoam 206e877a: (-s ours) am 89b10fff: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Wed, 26 Oct 2011 21:14:50 +0000]
am 206e877a: (-s ours) am 89b10fff: (-s ours) Import revised translations.  DO NOT MERGE

* commit '206e877a8caabdc1d31afd8884b5f13dc157bdf1':
  Import revised translations.  DO NOT MERGE

7 years agoam 89b10fff: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:08:57 +0000]
am 89b10fff: (-s ours) Import revised translations.  DO NOT MERGE

* commit '89b10fffc3be35dd469b12c0d35c4b2589f56133':
  Import revised translations.  DO NOT MERGE

7 years agoreset to ics-mr1, but keep history
Ed Heyl [Wed, 26 Oct 2011 18:50:25 +0000]
reset to ics-mr1, but keep history