OSDN Git Service
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 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: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 16:50:26 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I9fda103ee8c16f7042b22e0fc6bd09be32f3f194
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 [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
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 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 [Mon, 21 Nov 2011 22:57:31 +0000 (14:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I6ad8447cdf1cb726db8711f7288036c7f681da9d
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
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
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 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
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
Claudia de Veaux [Wed, 28 Sep 2011 19:27:23 +0000 (12:27 -0700)]
String cleanup per standards.
Bugs:
5165745,
5163232,
5162668,
5162667,
5162328
Change-Id: I13759f9946c44e5c62c8b93d9458538cb650a410
Additional string cleanup.
Eric Fischer [Fri, 23 Sep 2011 22:39:46 +0000 (15:39 -0700)]
am
b294d4d1: (-s ours) Import revised translations. DO NOT MERGE
* commit '
b294d4d1f92791a38d1dc77be61af16342df12eb':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 23 Sep 2011 22:22:34 +0000 (15:22 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I32eb5ffdf959eec6091ea74fd1d0bf5546b3ecd2
The Android Automerger [Thu, 22 Sep 2011 14:00:16 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Daisuke Miyakawa [Wed, 21 Sep 2011 19:58:05 +0000 (12:58 -0700)]
Merge "Only format PAUSE/WAIT character."
The Android Automerger [Wed, 21 Sep 2011 14:00:18 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Daisuke Miyakawa [Sun, 18 Sep 2011 22:20:00 +0000 (15:20 -0700)]
Only format PAUSE/WAIT character.
Must be after Iff9461d8c71c5800b0731c3708867003d75bb395
Bug:
5348938
Bug:
4177894
Change-Id: I0c5b5b759d11c9d494f9550b9a7bfe948a0690b6
Eric Fischer [Tue, 20 Sep 2011 22:41:13 +0000 (15:41 -0700)]
am
07599fc4: (-s ours) Import revised translations. DO NOT MERGE
* commit '
07599fc4ea3c5b25a3673c65ee8f572296feb873':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:30:55 +0000 (15:30 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic88e71e3b6ce06f22aae9eace0f38523a3e7bac5
Eric Fischer [Tue, 20 Sep 2011 17:55:07 +0000 (10:55 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 20 Sep 2011 17:23:09 +0000 (10:23 -0700)]
Import revised translations.
Change-Id: I2024294abb3c97c19f8dd8532c54451bf38df2d1
The Android Automerger [Tue, 20 Sep 2011 14:00:35 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Jaikumar Ganesh [Mon, 19 Sep 2011 23:39:27 +0000 (16:39 -0700)]
Merge "Reject OBEX connection request for OPP with Target."
Jaikumar Ganesh [Mon, 19 Sep 2011 22:42:27 +0000 (15:42 -0700)]
Reject OBEX connection request for OPP with Target.
According to OPP OBEX specification Sec 5.4, the Push
client should not use target header.
Patch contributed by: inshik.shin@samsung.com
Change-Id: Iaeaa2d488da6592f8bb76a9957ca4b784d032803
Eric Fischer [Fri, 16 Sep 2011 23:21:54 +0000 (16:21 -0700)]
am
78cccf96: (-s ours) Import revised translations. DO NOT MERGE
* commit '
78cccf9631d8cb6a316e3d34c1a2884b2d27a97b':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 22:20:13 +0000 (15:20 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Icc20b90b58b6ed4d23f47143f5ad33af70d8db5c
The Android Automerger [Tue, 13 Sep 2011 13:34:21 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Mon, 12 Sep 2011 16:49:24 +0000 (09:49 -0700)]
Import revised translations.
Change-Id: I9099de03abf4d6e2d67cfcd6dc455c1be2cd642b
The Android Automerger [Thu, 8 Sep 2011 13:34:24 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Jaikumar Ganesh [Thu, 8 Sep 2011 00:18:46 +0000 (17:18 -0700)]
Enforce permissions for Connection dialog intents.
Change-Id: I240985998b0d245aacb051e64b5fdaa335c9c06a
The Android Automerger [Wed, 7 Sep 2011 13:34:24 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Jake Hamby [Tue, 6 Sep 2011 20:31:56 +0000 (13:31 -0700)]
Merge "Use Notification.Builder.setProgress() for progress notifications."
Eric Fischer [Fri, 2 Sep 2011 21:45:42 +0000 (14:45 -0700)]
Import revised translations.
Change-Id: Ie59bbffb6a4bcbee61eca2f7762880aa04e21921
Jake Hamby [Fri, 2 Sep 2011 00:29:59 +0000 (17:29 -0700)]
Use Notification.Builder.setProgress() for progress notifications.
- Convert OPP service to use the new API to create notifications
with a ProgressBar, replacing the previous custom layout.
Bug:
5143664
Change-Id: Iae5e2d417e735588e11c4d17e4172ca40b9dfe73
The Android Automerger [Tue, 30 Aug 2011 20:42:50 +0000 (13:42 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 19:45:46 +0000 (12:45 -0700)]
merge in ics-release history after reset to master
Jaikumar Ganesh [Tue, 30 Aug 2011 16:50:40 +0000 (09:50 -0700)]
am
a6f56a6d: (-s ours) am
6060c8c7: Merge "Handle PBAP response packet as raw bytes"
* commit '
a6f56a6dd21099169a52ecc7717ad8e9236e5c83':
Handle PBAP response packet as raw bytes
Jaikumar Ganesh [Tue, 30 Aug 2011 01:00:50 +0000 (18:00 -0700)]
am
6060c8c7: Merge "Handle PBAP response packet as raw bytes"
* commit '
6060c8c7e2dcfe1bffd74e4aff04655a23da49bd':
Handle PBAP response packet as raw bytes
Jaikumar Ganesh [Mon, 29 Aug 2011 18:21:37 +0000 (11:21 -0700)]
Merge "Handle PBAP response packet as raw bytes"
Jaikumar Ganesh [Mon, 29 Aug 2011 18:16:11 +0000 (11:16 -0700)]
Merge "Handle PBAP response packet as raw bytes"
Yoshiharu Kurita [Mon, 21 Mar 2011 13:37:38 +0000 (14:37 +0100)]
Handle PBAP response packet as raw bytes
Adjust PBAP response packet to be always handled as bytes.
Currently, it is handled as string when is read from internal data.
This causes the lack of PullvCardListing packet and the abort of
PullPhonebook transaction when multi-byte characters are contained
into corresponding contacts.
This fix will avoid the lack and the abort by writing whole packet
into the target stream as byte.
Change-Id: I17ee3ada25718cc263c9e0942f75605bd971b638
Eric Fischer [Fri, 26 Aug 2011 21:52:11 +0000 (14:52 -0700)]
Import revised translations.
Change-Id: Ia4ec14de1e226cffb8f4604cf9f691806c2eea2f
Jaikumar Ganesh [Tue, 23 Aug 2011 03:16:28 +0000 (20:16 -0700)]
Merge "Fix SendConnection state params."
OSDN Git Service
