OSDN Git Service
Eric Fischer [Thu, 26 Apr 2012 18:54:24 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia11deef3743e0d63ccbe6f8eb6e311e3f2f11f69
Eric Fischer [Wed, 25 Apr 2012 18:05:18 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5a6ab133af77342121ff61d0aea40cc8626f956
Eric Fischer [Tue, 24 Apr 2012 18:18:52 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I635726426ba283e8428bfa11abf90da16a824ae1
Martijn Coenen [Tue, 24 Apr 2012 16:03:44 +0000 (09:03 -0700)]
Merge "Additional changes to support Bluetooth Beam."
Martijn Coenen [Fri, 6 Apr 2012 20:47:52 +0000 (13:47 -0700)]
Additional changes to support Bluetooth Beam.
- Added a whitelist permission, to ensure only system
services (such as NFC) can whitelist MAC addresses.
- Added HANDOVER_STATUS permission, to ensure handover
transfer status can only be received by eligible services
(such as NFC).
- Added new confirmation type HANDOVER_CONFIRMED; this indicates
the transfer was initiated by a handover, and doesn't need to be
confirmed. This type is also reused to send broadcasts
to the NFC service, so the NFC service can show notifications
and deal with the received data.
- Added 15 second timeout to whitelist.
- Modify notication code to not show any notifications for handover
transfers; instead, send broadcasts to indicate handover status.
- Modify "transfer complete" code to sendbroasts to indicate handover
status.
Change-Id: I00c08e09eaf44f0bd4bd837cb6b0c37b802742bc
Eric Fischer [Wed, 18 Apr 2012 18:59:40 +0000 (11:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5cfa785854414256c441ca703ad2480f0434f6d2
Eric Fischer [Fri, 13 Apr 2012 18:25:50 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia88990b571171704ec18c0c7766cb241579b907a
Martijn Coenen [Thu, 5 Apr 2012 01:30:27 +0000 (18:30 -0700)]
Merge "First cut at Bluetooth Beam."
Nick Pelly [Wed, 4 Apr 2012 01:10:12 +0000 (18:10 -0700)]
First cut at Bluetooth Beam.
Add Bluetooth address white-listing to avoid receive confirmation from
Beam interactions.
Change-Id: I25720c6e902c494cbb9845a30a175edad4225b89
Mike Lockwood [Tue, 3 Apr 2012 17:49:25 +0000 (10:49 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
Eric Fischer [Tue, 27 Mar 2012 17:57:21 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I292e4bd502c2f1569cbdb103529b7c4d6e01a52d
Eric Fischer [Fri, 23 Mar 2012 18:25:01 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ec2408e9e4524df80d0f68d37b5376ae8f9e0f4
Eric Fischer [Wed, 21 Mar 2012 18:06:37 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia20e0222899886a1a916fad99056f94083529b26
Daniel Lehmann [Tue, 13 Mar 2012 22:51:08 +0000 (15:51 -0700)]
Merge "Use new READ_CALL_LOG permission"
Daniel Lehmann [Sat, 10 Mar 2012 04:43:54 +0000 (20:43 -0800)]
Use new READ_CALL_LOG permission
Bug:
6141864
Change-Id: I16ce32e960e2b7e4fc104b247849c4013663a90b
Eric Fischer [Wed, 7 Mar 2012 19:28:51 +0000 (11:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I44b61aabac36d7c7844ac298aeb68892f5b855ab
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:10 +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: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
Eric Fischer [Thu, 26 Jan 2012 21:53:45 +0000 (13:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2103dd0783f7906276899fbeb8d746c003c852f5
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 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 [Tue, 29 Nov 2011 19:43:03 +0000 (11:43 -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 23:31:27 +0000 (15:31 -0800)]
am
0e5bc336: 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 19:00:51 +0000 (11:00 -0800)]
am
4292d313: 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:55:39 +0000 (11:55 -0800)]
am
dfea0983: 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:20:46 +0000 (23:20 +0000)]
am
d24c5574: 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:28:21 +0000 (20:28 +0000)]
am
f5b93a89: Import revised translations.
* commit '
f5b93a895a8d0e57e424c3f8d431bbbeb5aae2cb':
Import revised translations.
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
Ed Heyl [Mon, 31 Oct 2011 12:54:46 +0000 (05:54 -0700)]
Merge remote branch 'goog/ics-mr1' into ics-aah
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."
Ed Heyl [Fri, 28 Oct 2011 19:05:55 +0000 (19:05 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
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
Ed Heyl [Wed, 26 Oct 2011 21:53:25 +0000 (21:53 +0000)]
undo reset to ics-mr1 until we have a better method
Ed Heyl [Wed, 26 Oct 2011 18:50:23 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history
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:38:29 +0000 (07:38 -0700)]
am
0ad18d26: am
51bfce5b: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '
0ad18d26b4e9a5d1734703af45a9dd8ecedcd959':
Eric Fischer [Wed, 26 Oct 2011 14:38:29 +0000 (07:38 -0700)]
am
9a82dd66: (-s ours) am
33f2ee3e: (-s ours) Import revised translations. DO NOT MERGE
* commit '
9a82dd6651ea5cb146561ae8c473061286cf6d6f':
Import revised translations. DO NOT MERGE
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:45:06 +0000 (11:45 -0700)]
am
3fcdfc66: Merge "Import revised translations."
* commit '
3fcdfc66002e13baef18f7296082c404e98dad6b':
Import revised translations.
Eric Fischer [Tue, 25 Oct 2011 18:42:44 +0000 (11:42 -0700)]
Merge "Import revised translations."
OSDN Git Service
