OSDN Git Service
The Android Automerger [Thu, 8 Mar 2012 15:03:40 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 7 Mar 2012 19:28:51 +0000 (11:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I44b61aabac36d7c7844ac298aeb68892f5b855ab
The Android Automerger [Tue, 6 Mar 2012 15:03:08 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Mon, 5 Mar 2012 20:38:10 +0000 (12:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0d770468153cd24147eea856ba5c6ba517866203
The Android Open Source Project [Thu, 16 Feb 2012 19:25:41 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:25 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 18:14:02 +0000 (10:14 -0800)]
am
fe548d6a: Reconcile with ics-mr1-release
* commit '
fe548d6a965bfa990e1f9b291a3e526e52c5ad38':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:48 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iabe8f7374f8e66b88775543fb58d075f13088cbd
The Android Open Source Project [Thu, 16 Feb 2012 18:06:46 +0000 (10:06 -0800)]
am
2fc1b62a: Reconcile with ics-mr1-release
* commit '
2fc1b62a9cacfc28fc6a8b4b1e42a1aded82ca23':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:52 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie37047344c3707cc7880faa64f1b619044e21ed1
The Android Automerger [Tue, 14 Feb 2012 22:16:09 +0000 (14:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Fri, 10 Feb 2012 18:15:32 +0000 (10:15 -0800)]
am
a57e72ea: (-s ours) am
2e68425e: (-s ours) am
a167e65c: Import translations. DO NOT MERGE
* commit '
a57e72eaf40ab153ec06c51716d42102de1b311f':
Eric Fischer [Fri, 10 Feb 2012 18:15:27 +0000 (10:15 -0800)]
am
f9d3df5a: (-s ours) am
87712d44: am
a167e65c: Import translations. DO NOT MERGE
* commit '
f9d3df5a582328d90d2ba7cfd24f603b51c482c6':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:10:31 +0000 (10:10 -0800)]
am
2e68425e: (-s ours) am
a167e65c: Import translations. DO NOT MERGE
* commit '
2e68425ec2364490dc77b91c8f06b672033e00db':
Eric Fischer [Fri, 10 Feb 2012 18:08:33 +0000 (10:08 -0800)]
am
87712d44: am
a167e65c: Import translations. DO NOT MERGE
* commit '
87712d44052e90068f6aa6e021d652b21918e60b':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
am
a167e65c: Import translations. DO NOT MERGE
* commit '
a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:05:45 +0000 (10:05 -0800)]
am
a167e65c: Import translations. DO NOT MERGE
* commit '
a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 02:17:45 +0000 (18:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: If4e20cdabb365ab8a53bf6ad2fcaff4220534908
The Android Open Source Project [Wed, 1 Feb 2012 18:05:53 +0000 (10:05 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:11 +0000 (10:01 -0800)]
am
9a38c83e: Reconcile with ics-mr1-release
* commit '
9a38c83e1757dfb33f4593243267baa938339593':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:26 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I9fda103ee8c16f7042b22e0fc6bd09be32f3f194
The Android Automerger [Mon, 30 Jan 2012 15:02:30 +0000 (07:02 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Thu, 26 Jan 2012 21:53:45 +0000 (13:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2103dd0783f7906276899fbeb8d746c003c852f5
The Android Automerger [Mon, 2 Jan 2012 15:00:18 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
Eric Fischer [Thu, 29 Dec 2011 19:54:06 +0000 (11:54 -0800)]
Import revised translations.
Change-Id: I7d31d973487f1ef6906a6c1d1b0f13f7bc4629e9
The Android Open Source Project [Fri, 9 Dec 2011 22:57:41 +0000 (14:57 -0800)]
am
19417bef: Reconcile with ics-mr1-release
* commit '
19417befca4aa6b3d55b6d23103b75ee54ff6e89':
The Android Open Source Project [Thu, 8 Dec 2011 18:22:10 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0f886881d60df0aa053f019592baa0dd1ddb9424
The Android Open Source Project [Wed, 30 Nov 2011 20:56:05 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ifa837ef35780c94b49379c9caa315ae3dc9adb93
The Android Automerger [Wed, 30 Nov 2011 15:00:37 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 30 Nov 2011 14:46:26 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Tue, 29 Nov 2011 19:45:11 +0000 (11:45 -0800)]
am
0ac98162: Read the requested file size completely.
* commit '
0ac98162ff293fdaa23f93f9839aaad5428af537':
Read the requested file size completely.
Chih-Chung Chang [Fri, 18 Nov 2011 11:14:51 +0000 (19:14 +0800)]
Read the requested file size completely.
This was causing failures while sharing pictures
from Picassa over Bluetooth.
Bug:
5632161.
Change-Id: Ieb2697513299270b2982ebc6c9f0b367adf36d3a
Eric Fischer [Tue, 29 Nov 2011 18:33:31 +0000 (10:33 -0800)]
Import revised translations.
Change-Id: I726460f3143ba47c96a9105d79a44002c3639c43
The Android Automerger [Mon, 28 Nov 2011 20:22:39 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 22 Nov 2011 21:26:03 +0000 (13:26 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib3cb0799cd54228f43fa27fdf618cbcc0cea18a1
The Android Automerger [Tue, 22 Nov 2011 19:56:29 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:08:15 +0000 (21:08 -0800)]
am
0e5bc336: (-s ours) Import revised translations. DO NOT MERGE
* commit '
0e5bc33617343b0e1cce4fa6300e1fe8103a4292':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 22:57:31 +0000 (14:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I6ad8447cdf1cb726db8711f7288036c7f681da9d
The Android Open Source Project [Fri, 18 Nov 2011 23:43:30 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4f5b3197efd5b4f5b78ed2006276741a23aa501b
The Android Automerger [Thu, 17 Nov 2011 14:46:46 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:45:50 +0000 (05:45 -0800)]
am
4292d313: (-s ours) Import revised translations. DO NOT MERGE
* commit '
4292d31334f90c5f7c210eb2ab7b418255ff97a0':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:07:53 +0000 (10:07 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I36a2d5233771fee938b896a2dfea40a3fc65ccb5
The Android Automerger [Wed, 16 Nov 2011 14:46:32 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 15 Nov 2011 21:10:54 +0000 (13:10 -0800)]
am
dfea0983: (-s ours) am
d4fd0eca: Import revised translations. DO NOT MERGE
* commit '
dfea09839f680aaeee725ac68211ab9b84463664':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:51:40 +0000 (11:51 -0800)]
am
d4fd0eca: Import revised translations. DO NOT MERGE
* commit '
d4fd0eca9db6939853db49b06c22cf999c31deee':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Nov 2011 21:27:48 +0000 (13:27 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I2507276cf96ca69abc7bda02c8f62085470bfd16
The Android Automerger [Sun, 13 Nov 2011 15:01:12 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
Eric Fischer [Thu, 10 Nov 2011 22:06:37 +0000 (14:06 -0800)]
Merge "Import revised translations."
Eric Fischer [Thu, 10 Nov 2011 21:49:35 +0000 (13:49 -0800)]
Import revised translations.
Change-Id: Ia615a4ec462fae018ae7dc124b7f9eb03c508036
Eric Fischer [Thu, 10 Nov 2011 16:15:08 +0000 (16:15 +0000)]
am
d24c5574: (-s ours) am
2b5a552a: (-s ours) Import revised translations. DO NOT MERGE
* commit '
d24c5574cb5b23785bd1747414ef7685f63b9022':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Nov 2011 23:18:07 +0000 (23:18 +0000)]
am
2b5a552a: (-s ours) Import revised translations. DO NOT MERGE
* commit '
2b5a552a15777e350cad3cf7ccaa487b3612b1ca':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Nov 2011 01:39:39 +0000 (17:39 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I3870c3966929b0b37a02e04e1997a8ea412c0243
The Android Open Source Project [Fri, 4 Nov 2011 15:31:27 +0000 (08:31 -0700)]
Reconcile with ics-mr1-release
Change-Id: Ib0d0203d6720a5fe107788dd717fb574003688be
The Android Automerger [Thu, 3 Nov 2011 13:59:21 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Wed, 2 Nov 2011 21:15:53 +0000 (14:15 -0700)]
Merge "Import revised translations."
Eric Fischer [Wed, 2 Nov 2011 17:30:47 +0000 (17:30 +0000)]
am
f5b93a89: Import revised translations.
* commit '
f5b93a895a8d0e57e424c3f8d431bbbeb5aae2cb':
Import revised translations.
Eric Fischer [Wed, 2 Nov 2011 17:00:35 +0000 (10:00 -0700)]
Import revised translations.
Change-Id: Id7a2b4f41ff5359ed70b11135b508aeef4e7e544
The Android Automerger [Wed, 2 Nov 2011 13:46:20 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:20:10 +0000 (13:20 -0700)]
Import revised translations.
Change-Id: I6dc7478139cc139cb470c3ff3a88803d29a72ded
The Android Open Source Project [Mon, 31 Oct 2011 20:19:25 +0000 (13:19 -0700)]
Reconcile with ics-mr1-release
Change-Id: I5ed59dac01fe8fe14c6f5be3c5f3a1dacabe5b24
The Android Automerger [Sun, 30 Oct 2011 14:00:32 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Sun, 30 Oct 2011 13:47:11 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Fri, 28 Oct 2011 19:11:05 +0000 (12:11 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 28 Oct 2011 18:15:37 +0000 (11:15 -0700)]
Import revised translations.
Change-Id: I81d6021df5479ecc239b011334a3fd13b1382446
Eric Fischer [Thu, 27 Oct 2011 21:54:01 +0000 (21:54 +0000)]
am
80d32f53: (-s ours) am
90dbb7ad: (-s ours) Import revised translations. DO NOT MERGE
* commit '
80d32f533e4e3d46a81c23825ba681123f208766':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 21:46:41 +0000 (21:46 +0000)]
am
90dbb7ad: (-s ours) Import revised translations. DO NOT MERGE
* commit '
90dbb7ad4c2f720d34cf35bdd9f5638a95cc84fa':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:51:20 +0000 (09:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I63b6b0271dc637e32d688bd40bb8091bb2fbdb04
Eric Fischer [Thu, 27 Oct 2011 16:46:58 +0000 (16:46 +0000)]
am
52d274ff: (-s ours) Import revised translations. DO NOT MERGE
* commit '
52d274ff73f1b1cc780e56a5bdb0ee0bb33617af':
Import revised translations. DO NOT MERGE
The Android Automerger [Thu, 27 Oct 2011 13:46:50 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 27 Oct 2011 00:39:24 +0000 (17:39 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I0a4ce4ba6dec74820dd9747e5f54afb812af6940
Eric Fischer [Wed, 26 Oct 2011 18:36:36 +0000 (18:36 +0000)]
am
daa405c6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
daa405c64e8797030064bafd3fdc07e9f65d229f':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 18:31:38 +0000 (11:31 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 26 Oct 2011 18:04:38 +0000 (11:04 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I213936862cf124b075b7d306f20dfd5acdb85f90
The Android Automerger [Wed, 26 Oct 2011 16:53:03 +0000 (09:53 -0700)]
merge in ics-release history after reset to master
Ed Heyl [Wed, 26 Oct 2011 14:36:19 +0000 (14:36 +0000)]
am
51bfce5b: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '
51bfce5b57fc9830c3a7ddbb5959e9274a287724':
Eric Fischer [Wed, 26 Oct 2011 14:36:18 +0000 (14:36 +0000)]
am
33f2ee3e: (-s ours) Import revised translations. DO NOT MERGE
* commit '
33f2ee3e41464eb64823311d6763764fc858fd2f':
Import revised translations. DO NOT MERGE
The Android Automerger [Wed, 26 Oct 2011 14:05:30 +0000 (07:05 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Wed, 26 Oct 2011 12:48:09 +0000 (12:48 +0000)]
Merge remote branch 'goog/ics-mr0' into ics-mr1
Eric Fischer [Mon, 24 Oct 2011 23:48:40 +0000 (16:48 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I8aca8fc847ba24ba7b162caffd7cf6fd81baae7f
Eric Fischer [Tue, 25 Oct 2011 18:42:44 +0000 (11:42 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 25 Oct 2011 17:39:45 +0000 (10:39 -0700)]
Import revised translations.
Change-Id: I53a0035d8860fc3abe0f8152ff57d8cede94d5e4
Eric Fischer [Tue, 25 Oct 2011 00:01:35 +0000 (17:01 -0700)]
am
23055999: (-s ours) Import revised translations. DO NOT MERGE
* commit '
230559990e8a779424737674f6f42c822131b097':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 24 Oct 2011 23:48:40 +0000 (16:48 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I8aca8fc847ba24ba7b162caffd7cf6fd81baae7f
Eric Fischer [Fri, 21 Oct 2011 22:57:53 +0000 (15:57 -0700)]
am
d5c72b5b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
d5c72b5b66964de310960902d35db6196eaffb80':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 21:37:26 +0000 (14:37 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I5634433c5e917ef272543ac731ac46f89c51fde1
Eric Fischer [Fri, 21 Oct 2011 19:01:00 +0000 (12:01 -0700)]
am
70f5e06a: (-s ours) Import revised translations. DO NOT MERGE
* commit '
70f5e06a14c779ab82d9d0841ca80072a2fda6c3':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 00:47:32 +0000 (17:47 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I05af02f7255ba06517fd8920859034b71a28ebf9
Eric Fischer [Thu, 20 Oct 2011 18:36:36 +0000 (11:36 -0700)]
am
1940e6bf: (-s ours) Import revised translations. DO NOT MERGE
* commit '
1940e6bf4b5d10a781b0952e0a80b9546a3e04c0':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:08:20 +0000 (11:08 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I1ab7e6aaf14abeb8ce1ec6cc06138e1aa94a3aa7
The Android Automerger [Wed, 19 Oct 2011 14:44:54 +0000 (07:44 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Tue, 18 Oct 2011 23:27:59 +0000 (16:27 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 22:20:21 +0000 (15:20 -0700)]
Import revised translations.
Change-Id: I21d37a0ae2b004f73735febae66224951b239a8e
Eric Fischer [Tue, 18 Oct 2011 18:33:33 +0000 (11:33 -0700)]
am
d545000b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
d545000b6c55ef714fcf58f0750b5aeda2c258d6':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:08:14 +0000 (11:08 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iba86a399dfee9a3dca06efeb7eece57d031a1077
The Android Automerger [Tue, 11 Oct 2011 12:33:45 +0000 (05:33 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Fri, 7 Oct 2011 23:27:30 +0000 (16:27 -0700)]
Import revised translations.
Change-Id: I9011edf1af135cce02182b089a3cc1b0217f90da
The Android Automerger [Wed, 5 Oct 2011 13:59:06 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
Claudia de Veaux [Tue, 4 Oct 2011 21:15:28 +0000 (14:15 -0700)]
Merge "String cleanup per standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328"
The Android Automerger [Mon, 3 Oct 2011 14:00:33 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Fri, 30 Sep 2011 23:33:41 +0000 (16:33 -0700)]
Import revised translations.
Change-Id: I5aaa5b7da3a8a60c786f9e7552478abed965736e