8 years agoFix crash in tags app.
Jeff Hamilton [Mon, 25 Jul 2011 16:01:27 +0000]
Fix crash in tags app.

Change-Id: I0168a2ca26600b2bcd2aafbd4a97bb297343e029

8 years agoGut the Tags app.
Jeff Hamilton [Thu, 21 Jul 2011 04:14:00 +0000]
Gut the Tags app.

Bug: 5048185
Change-Id: I6f3ecd6d89b1146cf6b82733a56da7ce37fcf9b2

8 years agoRemove the share via My Tag feature.
Jeff Hamilton [Tue, 19 Jul 2011 03:49:05 +0000]
Remove the share via My Tag feature.

Bug: 5042256
Change-Id: I6d76fa7f694e2e504238deeb91b59a54846f2680

8 years agoReconcile with gingerbread-release
The Android Open Source Project [Mon, 18 Jul 2011 15:10:20 +0000]
Reconcile with gingerbread-release

Change-Id: I3969f6bf099cd7eaff41ff22515de9e9d2c139fb

8 years agoreset back to latest, and keep history
android-merger [Wed, 13 Jul 2011 23:30:12 +0000]
reset back to latest, and keep history

8 years agotemp reset to 39, and keep history
android-merger [Tue, 12 Jul 2011 22:15:28 +0000]
temp reset to 39, and keep history

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

Change-Id: I82afb270daa056f2246be1e226dcb51f5743c4b3

8 years agoMake Tags headless to handle vcards and raw text.
Jeff Hamilton [Thu, 30 Jun 2011 22:35:48 +0000]
Make Tags headless to handle vcards and raw text.

Change-Id: Ie9dbf5e895c2d349fbce0120d4d07daa33610cc6

8 years agoImport revised translations.
Eric Fischer [Mon, 20 Jun 2011 21:59:56 +0000]
Import revised translations.

Change-Id: I6f63ae5d0ba157db4f1352dd4f2dc32753409c49

8 years agomore checking for malformed ndef records.
Nick Kralevich [Fri, 10 Jun 2011 22:18:28 +0000]
more checking for malformed ndef records.

Change-Id: I0a788405b668ef76368fb746ca46d71da387beea

8 years agofix handling of malformed Text messages.
Nick Kralevich [Thu, 9 Jun 2011 23:51:41 +0000]
fix handling of malformed Text messages.

Change-Id: Ief47b9d21525c085b8ba7d701fbcddee49736312

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

Change-Id: I7325e4527f86eac12e097e2185f231529db7368c

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 13 May 2011 21:27:36 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam f5f743ed: am 478eadc7: Don\'t crash if the saved state is invalid.
Jeff Hamilton [Mon, 11 Apr 2011 21:28:37 +0000]
am f5f743ed: am 478eadc7: Don\'t crash if the saved state is invalid.

* commit 'f5f743edd2ffda7df49089d4bb4a2ab69d84e547':
  Don't crash if the saved state is invalid.

8 years agoam 478eadc7: Don\'t crash if the saved state is invalid.
Jeff Hamilton [Mon, 11 Apr 2011 21:24:35 +0000]
am 478eadc7: Don\'t crash if the saved state is invalid.

* commit '478eadc756466cc8438f0ba1db8e229fcd3a087a':
  Don't crash if the saved state is invalid.

8 years agoDon't crash if the saved state is invalid.
Jeff Hamilton [Mon, 4 Apr 2011 02:12:13 +0000]
Don't crash if the saved state is invalid.

Bug: 3429970
Change-Id: I0b2e82d0259b34dad9701cdef9645670863e0d70

8 years agoUse getter for obtaining photo data
Daisuke Miyakawa [Tue, 5 Apr 2011 15:16:47 +0000]
Use getter for obtaining photo data

Bug: 4066223
Change-Id: I2ef49fde19549da6515b6a7c9a6953fa8834cbaf

8 years agoDon't crash if the saved state is invalid.
Jeff Hamilton [Mon, 4 Apr 2011 02:12:13 +0000]
Don't crash if the saved state is invalid.

Bug: 3429970
Change-Id: I0b2e82d0259b34dad9701cdef9645670863e0d70

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 1 Apr 2011 20:27:41 +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:32:53 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam 22bf0a87: (-s ours) am 5a68dd6e: am c7329814: (-s ours) Import revised translation...
Eric Fischer [Tue, 29 Mar 2011 23:59:44 +0000]
am 22bf0a87: (-s ours) am 5a68dd6e: am c7329814: (-s ours) Import revised translations.  DO NOT MERGE

* commit '22bf0a872be69b6c036edef5437b206faafa997d':
  Import revised translations.  DO NOT MERGE

8 years agoam 5a68dd6e: am c7329814: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:20:01 +0000]
am 5a68dd6e: am c7329814: (-s ours) Import revised translations.  DO NOT MERGE

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

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

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

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

Change-Id: I0f7b061bc52620456e1f7f2f9ed026c7ed20d79f

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 23:31:10 +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:43:50 +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:25:36 +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:01 +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:31 +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:48:57 +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:07 +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 20:10:22 +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: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 [Mon, 21 Mar 2011 12:42:16 +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:24 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam 7c85bc8b: (-s ours) am 14ee140a: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Sat, 19 Mar 2011 00:05:39 +0000]
am 7c85bc8b: (-s ours) am 14ee140a: (-s ours) Import revised translations.  DO NOT MERGE

* commit '7c85bc8b212385ebbf07203e744bdbf7592b8c5e':
  Import revised translations.  DO NOT MERGE

8 years agoam 14ee140a: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 19 Mar 2011 00:02:32 +0000]
am 14ee140a: (-s ours) Import revised translations.  DO NOT MERGE

* commit '14ee140a21157c77bc65a59913d26a244c1adc98':
  Import revised translations.  DO NOT MERGE

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

Change-Id: I0a6efe70cbaf459c24f107223e40f1ccea6d081e

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 18 Mar 2011 17:41: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 [Thu, 17 Mar 2011 12:43:53 +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, 16 Mar 2011 12:43:33 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoImport revised translations.
Eric Fischer [Tue, 15 Mar 2011 17:47:42 +0000]
Import revised translations.

Change-Id: Ibff152c791ab9a1507eb75552c957baff15b0b24

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 15 Mar 2011 05:33:36 +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, 12 Mar 2011 19:56:13 +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, 11 Mar 2011 18:35:23 +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, 9 Mar 2011 16:53:53 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam c28ec196: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Mar 2011 02:42:55 +0000]
am c28ec196: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Mar 2011 23:47:13 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I64bf26ef966a2cd10e9cd1482ceef6c1ac83fc10

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

8 years agoam 7ea61dbe: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Mar 2011 21:24:48 +0000]
am 7ea61dbe: (-s ours) Import revised translations.  DO NOT MERGE

* commit '7ea61dbe27818f9d829cf9f2a387e2ec0075b7c9':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Mar 2011 20:57:20 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I4f3f053e0b9ea232d82edfd781baf7713d1232fd

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 5 Mar 2011 05:56:41 +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, 5 Mar 2011 01:41:51 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoam 4a1f7e1f: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 4 Mar 2011 22:01:35 +0000]
am 4a1f7e1f: (-s ours) Import revised translations.  DO NOT MERGE

* commit '4a1f7e1f8a88a9f09737d457d2cc6e6391f731c4':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 4 Mar 2011 21:47:34 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I7911328ea587c7acf7a77cb69025278b3f445ecb

8 years agoMerge "Use vcard lib"
Daisuke Miyakawa [Fri, 4 Mar 2011 16:20:13 +0000]
Merge "Use vcard lib"

8 years agoUse vcard lib
Daisuke Miyakawa [Fri, 4 Mar 2011 02:34:40 +0000]
Use vcard lib

Now the vcard code is available with LOCAL_SDK_VERSION=9.

Change-Id: I8aad414263a2971c3052b231e20c6e1ff129d5ca

8 years agoam 778945a0: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 4 Mar 2011 02:22:32 +0000]
am 778945a0: (-s ours) Import revised translations.  DO NOT MERGE

* commit '778945a01175b97d4ff4d8f343458e876625d7b7':
  Import revised translations.  DO NOT MERGE

8 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Mar 2011 22:17:40 +0000]
merge in gingerbread-release history after reset to gingerbread

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Mar 2011 22:11:07 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I17bb3e1cdad7afb8f870bdc0c2054cb641f09bca

8 years agoam 64f046f3: (-s ours) am 8a4b5421: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Mar 2011 20:54:37 +0000]
am 64f046f3: (-s ours) am 8a4b5421: Import revised translations.  DO NOT MERGE

* commit '64f046f319279fbec240e1739d9115a1c618609f':
  Import revised translations.  DO NOT MERGE

8 years agoam 8a4b5421: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Mar 2011 22:44:35 +0000]
am 8a4b5421: Import revised translations.  DO NOT MERGE

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

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

Change-Id: I9c97838c1cdd7afc2d523cb6da6a54e4ccf2714b

8 years agoam c2f6ce03: (-s ours) am 6a51d9b1: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Wed, 23 Feb 2011 05:36:09 +0000]
am c2f6ce03: (-s ours) am 6a51d9b1: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 6a51d9b1: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 22 Feb 2011 22:48:57 +0000]
am 6a51d9b1: (-s ours) Import revised translations.  DO NOT MERGE

* commit '6a51d9b1153a9fade2c8a90f83d0837f69e2c462':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Feb 2011 01:25:18 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I6cba092a6d628b21db5261e8b4d1ae241a47bea1

8 years agoImport revised translations.
Eric Fischer [Thu, 17 Feb 2011 18:21:04 +0000]
Import revised translations.

Change-Id: Iea7003871d2dd33e59e2a1e927c4a09eb1e07080

8 years agoam ae76516d: (-s ours) am 0a4043e0: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:42:13 +0000]
am ae76516d: (-s ours) am 0a4043e0: Import revised translations.  DO NOT MERGE

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

8 years agoam 0a4043e0: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:36:59 +0000]
am 0a4043e0: Import revised translations.  DO NOT MERGE

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

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:22:59 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Ibc70d4fe5731ba9eab549c7943a64108316c588e

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Feb 2011 01:25:18 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I6cba092a6d628b21db5261e8b4d1ae241a47bea1

8 years agoam e17d6fd3: am 862b9759: Merge "Fix context menus on user builds." into gingerbread
Jeff Hamilton [Thu, 10 Feb 2011 21:57:22 +0000]
am e17d6fd3: am 862b9759: Merge "Fix context menus on user builds." into gingerbread

* commit 'e17d6fd382f7b3279a6ba07a53f439247ac1a5b4':
  Fix context menus on user builds.

8 years agoam 5c735c86: (-s ours) am d84c1bac: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Thu, 10 Feb 2011 21:57:20 +0000]
am 5c735c86: (-s ours) am d84c1bac: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 862b9759: Merge "Fix context menus on user builds." into gingerbread
Jeff Hamilton [Thu, 10 Feb 2011 21:52:18 +0000]
am 862b9759: Merge "Fix context menus on user builds." into gingerbread

* commit '862b975969e386fc7fa611c58e0e657c6977c83e':
  Fix context menus on user builds.

8 years agoam d84c1bac: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Feb 2011 21:51:45 +0000]
am d84c1bac: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 9ca3e688: (-s ours) am 069c50cb: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:52:19 +0000]
am 9ca3e688: (-s ours) am 069c50cb: Import revised translations.  DO NOT MERGE

* commit '9ca3e688f26c46618b4baa731ca5f5218fb18181':
  Import revised translations.  DO NOT MERGE

8 years agoam 069c50cb: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:47:56 +0000]
am 069c50cb: Import revised translations.  DO NOT MERGE

* commit '069c50cb9a5f1da7edbc99b82f43ff71ec555002':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 02:03:25 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I510ff3b0be91643d1ef37d4faf3e691b5507d1eb

8 years agoMerge "Fix context menus on user builds." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 01:50:42 +0000]
Merge "Fix context menus on user builds." into gingerbread

8 years agoFix context menus on user builds.
Jeff Hamilton [Wed, 9 Feb 2011 01:50:04 +0000]
Fix context menus on user builds.

Change-Id: I0d4007319c881a8b4db4aa52b8f61ff86803e3a9

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Feb 2011 21:38:38 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I68464a3f8fe64d53c5105293162016f7963e8ac1

8 years agoam aae5d223: (-s ours) am bcb8a75a: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:53:08 +0000]
am aae5d223: (-s ours) am bcb8a75a: Import revised translations.  DO NOT MERGE

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

8 years agoam bcb8a75a: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:45:51 +0000]
am bcb8a75a: Import revised translations.  DO NOT MERGE

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

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 01:31:31 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I34d7020de72c22437e83eb36eda5ce5de2814a86

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Feb 2011 21:38:38 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I68464a3f8fe64d53c5105293162016f7963e8ac1

8 years agoUpdate Tag.apk for final GB MR changes.
Nick Pelly [Tue, 1 Feb 2011 16:26:41 +0000]
Update Tag.apk for final GB MR changes.

Change-Id: I598ba6429113242882b4ad532a527734b873461d

8 years agoam 32d0dc00: am 2313ef98: Merge "Update Tag.apk for final GB MR changes." into ginger...
Nick Pelly [Tue, 1 Feb 2011 22:23:20 +0000]
am 32d0dc00: am 2313ef98: Merge "Update Tag.apk for final GB MR changes." into gingerbread

* commit '32d0dc006ddc414d65dfa409d6e298b6e0197cc0':
  Update Tag.apk for final GB MR changes.

8 years agoam 2313ef98: Merge "Update Tag.apk for final GB MR changes." into gingerbread
Nick Pelly [Tue, 1 Feb 2011 22:19:16 +0000]
am 2313ef98: Merge "Update Tag.apk for final GB MR changes." into gingerbread

* commit '2313ef98f21a8d2824b738a2f61e04919381eb43':
  Update Tag.apk for final GB MR changes.

8 years agoam 457c96d1: (-s ours) am f37c6139: DO NOT MERGE
Nick Pelly [Tue, 1 Feb 2011 21:27:15 +0000]
am 457c96d1: (-s ours) am f37c6139: DO NOT MERGE

* commit '457c96d163451ce6e4dd858650ab933a6bf093bb':
  DO NOT MERGE

8 years agoam f37c6139: DO NOT MERGE
Nick Pelly [Tue, 1 Feb 2011 19:50:32 +0000]
am f37c6139: DO NOT MERGE

* commit 'f37c6139a0cb05c5d8a495c718cbe0e5a89e7785':
  DO NOT MERGE

8 years agoDO NOT MERGE
Nick Pelly [Tue, 1 Feb 2011 16:26:41 +0000]
DO NOT MERGE

Cherry-pick from GB to HC.

Update Tag.apk for final GB MR changes.

Change-Id: I2ade30d01f76929861deef3a685dc326d00cdae4

8 years agoam efe16feb: (-s ours) resolved conflicts for merge of fb20fb14 to honeycomb-plus...
Eric Fischer [Tue, 1 Feb 2011 18:05:12 +0000]
am efe16feb: (-s ours) resolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp

* commit 'efe16febefe47888cfefde0215ea80ea3de498c0':
  Import revised translations.  DO NOT MERGE.  Bug 3394542

8 years agoMerge "Update Tag.apk for final GB MR changes." into gingerbread
Nick Pelly [Tue, 1 Feb 2011 17:39:48 +0000]
Merge "Update Tag.apk for final GB MR changes." into gingerbread

8 years agoUpdate Tag.apk for final GB MR changes.
Nick Pelly [Tue, 1 Feb 2011 16:26:41 +0000]
Update Tag.apk for final GB MR changes.

Change-Id: Ia3e06f162dc33c2a706ecbc2d433ab1df38303d1

8 years agoresolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp
Eric Fischer [Tue, 1 Feb 2011 02:49:26 +0000]
resolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp

Change-Id: I6b80957186ce855000fd8292ca080ae47e37da49

8 years agoam e89f7ae5: (-s ours) am 97a18afe: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Tue, 1 Feb 2011 02:15:28 +0000]
am e89f7ae5: (-s ours) am 97a18afe: (-s ours) Import revised translations. DO NOT MERGE

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

8 years agoam 97a18afe: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 01:49:12 +0000]
am 97a18afe: (-s ours) Import revised translations. DO NOT MERGE

* commit '97a18afe60d90f65bb98138e12bd5bffcf618194':
  Import revised translations. DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE. Bug 3394542
Eric Fischer [Mon, 31 Jan 2011 20:48:52 +0000]
Import revised translations.  DO NOT MERGE.  Bug 3394542

Change-Id: Ia93ea0edcc209740369ed0043fbd7e8e17d941de

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 31 Jan 2011 20:26:10 +0000]
Import revised translations. DO NOT MERGE

Change-Id: Ie680fba28e06d6b1ba350229cba4deffd96cb037

8 years agoam b4fd2aa0: Reconcile gingerbread-plus-aosp and honeycomb
The Android Open Source Project [Sun, 30 Jan 2011 20:56:01 +0000]
am b4fd2aa0: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'b4fd2aa0e2a3befc7d6298d6d700a6fcd24ccbf6':