OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:00 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Eric Fischer [Mon, 13 Jul 2009 23:59:21 +0000 (16:59 -0700)]
Eric Fischer [Mon, 13 Jul 2009 22:48:01 +0000 (15:48 -0700)]
Import new translations
Sriram Raman [Tue, 23 Jun 2009 05:05:04 +0000 (22:05 -0700)]
am
cbf250fd: Remove wbxmltest from tests build
Merge commit '
cbf250fd214a376a2a5f2a63897ea6ea167c8312'
* commit '
cbf250fd214a376a2a5f2a63897ea6ea167c8312':
Remove wbxmltest from tests build
Sriram Raman [Tue, 23 Jun 2009 00:22:20 +0000 (17:22 -0700)]
Remove wbxmltest from tests build
Eric Fischer [Wed, 10 Jun 2009 22:32:38 +0000 (15:32 -0700)]
am
5cc0b6cd: am
dd1797ca: AI 149721: Import Portuguese translations.
Merge commit '
5cc0b6cd57d91912667b25ed752b0b3860f3e119'
* commit '
5cc0b6cd57d91912667b25ed752b0b3860f3e119':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:31:39 +0000 (12:31 -0700)]
am
dd1797ca: AI 149721: Import Portuguese translations.
Merge commit '
dd1797ca4877c78409972a98f19b6e78ab81e5cb' into donut
* commit '
dd1797ca4877c78409972a98f19b6e78ab81e5cb':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:26:08 +0000 (12:26 -0700)]
AI 149721: Import Portuguese translations.
Automated import of CL 149721
Wei Huang [Wed, 20 May 2009 19:22:21 +0000 (12:22 -0700)]
API changes for Im.Messages.
Eric Fischer [Fri, 1 May 2009 01:13:02 +0000 (18:13 -0700)]
am
afd5c7f: am
603da07: AI 148147: Import lots of zh_TW translation chan
Merge commit '
afd5c7f4226bc86c1c428aa7d0632998b036e0df'
* commit '
afd5c7f4226bc86c1c428aa7d0632998b036e0df':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:37:35 +0000 (17:37 -0700)]
am
603da07: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
603da0787c5d593b6bf17bab2fdc18df38bf9f72' into donut
* commit '
603da0787c5d593b6bf17bab2fdc18df38bf9f72':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:16 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
Eric Fischer [Fri, 1 May 2009 00:24:31 +0000 (17:24 -0700)]
am
3b67ed9: am
287bb37: AI 148026: Update zh_TW translations.
Merge commit '
3b67ed9d0d01f3f95d46faa62818199b0ebef738'
* commit '
3b67ed9d0d01f3f95d46faa62818199b0ebef738':
AI 148026: Update zh_TW translations.
Eric Fischer [Fri, 1 May 2009 00:10:43 +0000 (17:10 -0700)]
am
287bb37: AI 148026: Update zh_TW translations.
Merge commit '
287bb37f5ea323760f987862a0299f79edc84ea1' into donut
* commit '
287bb37f5ea323760f987862a0299f79edc84ea1':
AI 148026: Update zh_TW translations.
Eric Fischer [Thu, 30 Apr 2009 23:48:34 +0000 (16:48 -0700)]
AI 148026: Update zh_TW translations.
Automated import of CL 148026
Christopher Tate [Wed, 29 Apr 2009 22:17:12 +0000 (15:17 -0700)]
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/packages/apps/IM
Eric Fischer [Wed, 29 Apr 2009 20:43:26 +0000 (13:43 -0700)]
am
f9d10a6: am
7708830: AI 147962: Import updated zh_TW translations.
Merge commit '
f9d10a67190e3fc41ecda9ca9796e973da149150'
* commit '
f9d10a67190e3fc41ecda9ca9796e973da149150':
AI 147962: Import updated zh_TW translations.
Wei Huang [Wed, 29 Apr 2009 05:42:01 +0000 (22:42 -0700)]
store contact_id in messages table instead of the contact name string; merge messages and group messages table.
- modify the IM app to use the new Im.Messages.getContentUriByThreadId().
- corresponding changes due to android.provider.Im api change.
Eric Fischer [Wed, 29 Apr 2009 04:57:27 +0000 (21:57 -0700)]
am
7708830: AI 147962: Import updated zh_TW translations.
Merge commit '
7708830e19f172c941d6ce1bcb3dcec939cfbe92' into donut
* commit '
7708830e19f172c941d6ce1bcb3dcec939cfbe92':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Tue, 28 Apr 2009 22:48:40 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
The Android Open Source Project [Fri, 24 Apr 2009 20:55:02 +0000 (13:55 -0700)]
Merge commit 'korg/donut'
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:18 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:37 +0000 (17:12 -0700)]
Merge donut into master
Eric Fischer [Wed, 22 Apr 2009 19:33:56 +0000 (12:33 -0700)]
AI 147406: Import revised translations.
Automated import of CL 147406
Eric Fischer [Thu, 16 Apr 2009 18:01:06 +0000 (11:01 -0700)]
AI 146517: Import translation changes.
DO NOT MERGE
Automated import of CL 146517
Eric Fischer [Wed, 15 Apr 2009 20:30:20 +0000 (13:30 -0700)]
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
The Android Open Source Project [Wed, 15 Apr 2009 01:18:15 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'
Eric Fischer [Tue, 14 Apr 2009 19:10:43 +0000 (12:10 -0700)]
AI 146175: Import updated translations.
Automated import of CL 146175
Eric Fischer [Tue, 14 Apr 2009 00:16:19 +0000 (17:16 -0700)]
AI 146037: Import updated translations.
Automated import of CL 146037
Eric Fischer [Thu, 9 Apr 2009 01:43:30 +0000 (18:43 -0700)]
AI 145225: Import more revised translations into cupcake.
Automated import of CL 145225
Eric Fischer [Wed, 8 Apr 2009 07:31:52 +0000 (00:31 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Wed, 8 Apr 2009 07:30:38 +0000 (00:30 -0700)]
AI 144913: am: CL 144912 Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Original author: enf
Automated import of CL 144913
Eric Fischer [Wed, 8 Apr 2009 01:15:15 +0000 (18:15 -0700)]
AI 144977: Import revised translations.
DO NOT MERGE
Automated import of CL 144977
Eric Fischer [Tue, 7 Apr 2009 20:55:06 +0000 (13:55 -0700)]
AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
Import a bunch of revised translations.
Automated import of CL 144912
Eric Fischer [Tue, 7 Apr 2009 18:48:29 +0000 (11:48 -0700)]
AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
Eric Fischer [Fri, 3 Apr 2009 06:32:29 +0000 (23:32 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Fri, 3 Apr 2009 06:31:17 +0000 (23:31 -0700)]
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
Eric Fischer [Fri, 3 Apr 2009 04:42:06 +0000 (21:42 -0700)]
AI 144355: Automated g4 rollback of changelist 144335.
*** Reason for rollback ***
Roll back US Spanish import because it made the build too big.
*** Original change description ***
Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144355
Eric Fischer [Thu, 2 Apr 2009 23:42:14 +0000 (16:42 -0700)]
AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 144336
Eric Fischer [Thu, 2 Apr 2009 23:39:22 +0000 (16:39 -0700)]
AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
Wink Saville [Thu, 2 Apr 2009 18:02:15 +0000 (11:02 -0700)]
Merge branch 'readonly-p4-master'
Wink Saville [Thu, 2 Apr 2009 18:00:56 +0000 (11:00 -0700)]
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
Wink Saville [Thu, 2 Apr 2009 08:37:03 +0000 (01:37 -0700)]
AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
The Android Open Source Project [Wed, 1 Apr 2009 04:34:26 +0000 (21:34 -0700)]
Merge commit 'goog/readonly-p4-master'
Eric Fischer [Tue, 31 Mar 2009 21:20:41 +0000 (14:20 -0700)]
AI 143712: am: CL 143685 am: CL 143547 Import revised translations.
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143712
Eric Fischer [Tue, 31 Mar 2009 18:11:17 +0000 (11:11 -0700)]
AI 143685: am: CL 143547 Import revised translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 143685
Eric Fischer [Mon, 30 Mar 2009 22:52:27 +0000 (15:52 -0700)]
AI 143547: Import revised translations.
BUG=
1738388
Automated import of CL 143547
The Android Open Source Project [Sun, 29 Mar 2009 15:55:11 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
Dianne Hackborn [Sat, 28 Mar 2009 02:19:20 +0000 (19:19 -0700)]
AI 143364: am: CL 143214 am: CL 143009 More work on issue #
1739507 (kila-user build is too big): remove some unused application resources I found.
Original author: hackbod
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143364
Dianne Hackborn [Sat, 28 Mar 2009 01:26:13 +0000 (18:26 -0700)]
AI 143214: am: CL 143009 More work on issue #
1739507 (kila-user build is too big): remove some unused application resources I found.
Original author: hackbod
Merged from: //branches/cupcake/...
Automated import of CL 143214
Jean-Baptiste Queru [Sat, 28 Mar 2009 00:43:54 +0000 (17:43 -0700)]
AI 143296: Merge from donut Change 143147
Automated import of CL 143296
The Android Open Source Project [Fri, 27 Mar 2009 22:31:12 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Dianne Hackborn [Fri, 27 Mar 2009 21:59:24 +0000 (14:59 -0700)]
AI 143147: Manual integration
Automated import of CL 143147
Dianne Hackborn [Thu, 26 Mar 2009 23:28:26 +0000 (16:28 -0700)]
Automated import from //branches/cupcake/...@143009,143009
Dianne Hackborn [Thu, 26 Mar 2009 01:37:34 +0000 (18:37 -0700)]
Automated import from //branches/cupcake/...@142829,142829
Eric Fischer [Thu, 26 Mar 2009 00:04:28 +0000 (17:04 -0700)]
Automated import from //branches/donutburger/...@142720,142720
Eric Fischer [Wed, 25 Mar 2009 23:13:52 +0000 (16:13 -0700)]
Automated import from //branches/master/...@142759,142759
Eric Fischer [Wed, 25 Mar 2009 22:22:44 +0000 (15:22 -0700)]
Automated import from //branches/cupcake/...@142643,142643
Eric Fischer [Wed, 25 Mar 2009 01:47:15 +0000 (18:47 -0700)]
Automated import from //branches/master/...@140875,140875
Eric Fischer [Wed, 25 Mar 2009 01:47:01 +0000 (18:47 -0700)]
Automated import from //branches/donutburger/...@140873,140873
The Android Open Source Project [Fri, 20 Mar 2009 06:08:56 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:48 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:08:48 +0000 (16:08 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Fri, 13 Mar 2009 20:04:24 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Mon, 9 Mar 2009 18:52:14 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Thu, 5 Mar 2009 22:34:38 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:32:25 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:50 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:32 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:41 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Thu, 19 Feb 2009 18:57:35 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:53 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
The Android Open Source Project [Tue, 10 Feb 2009 23:44:04 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:16:13 +0000 (00:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:13:44 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:05:40 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:04:00 +0000 (14:04 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:16:06 +0000 (16:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:13 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 02:04:22 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:25 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Thu, 18 Dec 2008 02:05:57 +0000 (18:05 -0800)]
Code drop from //branches/cupcake/...@124589
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution
OSDN Git Service
