Commit Graph

53 Commits

Author SHA1 Message Date
Andy Stadler
a191c5bfc2 Merge branch 'readonly-p4-master' 2009-04-03 15:43:52 -07:00
Andy Stadler
d505973178 AI 144522: am: CL 144520 General cleanup after the integrations in CL 143018. Some spelling
errors, inconsistencies in passing Application/Activity/Context, and
  some error handling cleanups.  These are all changes that would have
  probably been made before the original submits, but I didn't want
  to fix them in the integration step.
  Original author: stadler

Automated import of CL 144522
2009-04-03 15:42:31 -07:00
Eric Fischer
b222a9a729 Merge branch 'readonly-p4-master' 2009-04-02 23:32:29 -07:00
Eric Fischer
e6d8d70412 AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144411
2009-04-02 23:31:17 -07:00
The Android Open Source Project
0f6f4930ee Merge branch 'open_source_contributions_already_merged' into google_internal 2009-03-29 08:55:18 -07:00
Eric Fischer
37939cfcc4 AI 143313: am: CL 143164 am: CL 142860 Add a special case for copying translations from other applications.
If you absolutely must add a string after string freeze, and that
  same string has already been translated for another application
  in a similar context, you can copy the translation by specifying
  it by numeric message ID.
  Fix the incorrect IDs I had told people for a couple of strings,
  add the script that will make a flat-file version of translations
  so you can find out the IDs yourself, and reimport the translations
  for the couple of applications that wanted to copy translations.
  Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143313
2009-03-27 18:03:00 -07:00
Andy Stadler
bd68145460 AI 143282: am: CL 143018 Integrate changes to generalize selection of Sender & Store.
Rollup of CL's 140586, 140598, 140600, 140655, 140656 (partial),
  141082 (partial).
  All unit tests pass.  Simple functional tests:  Create IMAP & POP3
  accounts.  For each account:  Download messages.  Send message.
  Check account settings.  Delete account.
  Original author: stadler
  Merged from: //branches/donutburger/...

Automated import of CL 143282
2009-03-27 16:59:36 -07:00
The Android Open Source Project
315a7b3b74 Merge commit 'korg/cupcake' 2009-03-27 15:31:12 -07:00
Eric Fischer
8d448bbd7c Automated import from //branches/cupcake/...@142860,142860 2009-03-25 21:52:36 -07:00
Eric Fischer
f951b4024e Automated import from //branches/master/...@142759,142759 2009-03-25 16:13:52 -07:00
Andy Stadler
d211e5c51c Automated import from //branches/master/...@142747,142747 2009-03-25 16:00:30 -07:00
Tadashi Takaoka
123ef48a0d Automated import from //branches/master/...@142676,142676 2009-03-25 15:27:34 -07:00
Eric Fischer
bcab70b68c Automated import from //branches/cupcake/...@142643,142643 2009-03-25 15:22:44 -07:00
Andy Stadler
6a571d8c6c Automated import from //branches/cupcake/...@142594,142594 2009-03-25 15:07:39 -07:00
Tadashi Takaoka
44cf2e2882 Automated import from //branches/cupcake/...@142522,142522 2009-03-25 01:29:24 -07:00
Tadashi Takaoka
9d8375cba6 Automated import from //branches/master/...@142462,142462 2009-03-24 22:52:36 -07:00
Tadashi Takaoka
1d60657509 Automated import from //branches/master/...@142460,142460 2009-03-24 22:52:06 -07:00
Andy Stadler
ce4504b78e Automated import from //branches/master/...@142153,142153 2009-03-24 22:20:55 -07:00
Andy Stadler
75a07d0a22 Automated import from //branches/master/...@142111,142111 2009-03-24 21:33:34 -07:00
Eric Fischer
b4708f4007 Automated import from //branches/master/...@141869,141869 2009-03-24 21:06:32 -07:00
Andy Stadler
247cd995b8 Automated import from //branches/master/...@141239,141239 2009-03-24 19:53:01 -07:00
Tadashi Takaoka
7e7abb0e3d Automated import from //branches/cupcake/...@142457,142457 2009-03-24 19:45:36 -07:00
Tadashi Takaoka
d351a92869 Automated import from //branches/cupcake/...@142456,142456 2009-03-24 19:44:56 -07:00
Andy Stadler
0589ff73b0 Automated import from //branches/cupcake/...@142151,142151 2009-03-24 19:05:40 -07:00
Andy Stadler
f7eead2074 Automated import from //branches/cupcake/...@142109,142109 2009-03-24 19:00:38 -07:00
Eric Fischer
6bed3e8d38 Automated import from //branches/master/...@140875,140875 2009-03-24 18:47:15 -07:00
Eric Fischer
4fdc52ee3d Automated import from //branches/cupcake/...@141866,141866 2009-03-24 18:33:42 -07:00
The Android Open Source Project
8aeb922462 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:56 -07:00
The Android Open Source Project
3469902379 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:48 -07:00
Jean-Baptiste Queru
29d6199573 Merge commit 'remotes/korg/cupcake' into merge 2009-03-17 16:08:47 -07:00
The Android Open Source Project
3b85e2c2b5 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:24 -07:00
The Android Open Source Project
3debc4f25a auto import from //branches/cupcake/...@137873 2009-03-11 12:11:58 -07:00
The Android Open Source Project
fd09f8019a auto import from //branches/cupcake/...@137197 2009-03-09 11:52:14 -07:00
The Android Open Source Project
3db9542af6 auto import from //depot/cupcake/@136594 2009-03-05 14:34:38 -08:00
The Android Open Source Project
96c5af40d6 auto import from //depot/cupcake/@135843 2009-03-03 19:32:22 -08:00
The Android Open Source Project
8c2158a5eb auto import from //depot/cupcake/@135843 2009-03-03 18:28:50 -08:00
The Android Open Source Project
1f5bbf66d1 auto import from //depot/cupcake/@132589 2009-03-03 14:04:31 -08:00
The Android Open Source Project
7a8703fda9 auto import from //depot/cupcake/@137055 2009-03-02 22:54:40 -08:00
The Android Open Source Project
88a1d6f92d auto import from //branches/cupcake/...@132276 2009-02-19 10:57:35 -08:00
The Android Open Source Project
ff4eb775df auto import from //branches/cupcake/...@131421 2009-02-13 12:57:53 -08:00
The Android Open Source Project
f7ae27b973 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:04 -08:00
The Android Open Source Project
6f46398754 Merge branch 'cupcake' 2009-01-22 00:16:12 -08:00
The Android Open Source Project
be72b1d08a auto import from //branches/cupcake/...@127436 2009-01-22 00:13:44 -08:00
The Android Open Source Project
3f07715529 Merge branch 'cupcake' 2009-01-20 14:05:39 -08:00
The Android Open Source Project
5766d93b3b auto import from //branches/cupcake/...@127101 2009-01-20 14:04:00 -08:00
android-build SharedAccount
2147122618 auto import from //branches/cupcake/...@126645 2009-01-15 16:23:29 -08:00
The Android Open Source Project
b957c79556 auto import from //branches/cupcake/...@126645 2009-01-15 16:12:13 -08:00
The Android Open Source Project
a4a093e38d Merge branch 'cupcake' 2009-01-09 18:04:22 -08:00
The Android Open Source Project
ba1a40098c auto import from //branches/cupcake/...@125939 2009-01-09 17:51:25 -08:00
Jean-Baptiste Queru
6861a08d78 Merge commit 'remotes/korg/cupcake' 2008-12-19 07:55:44 -08:00