OSDN Git Service
Xavier Ducrohet [Thu, 19 Nov 2009 01:58:54 +0000 (17:58 -0800)]
am
934b8ca5: resolved conflicts for merge of
8915fd90 to eclair-mr2-plus-aosp
Merge commit '
934b8ca57bb5d45d28450c12af3a5c765ba51c12'
* commit '
934b8ca57bb5d45d28450c12af3a5c765ba51c12':
Remove components that were moved to sdk.git and update build scripts.
Xavier Ducrohet [Thu, 19 Nov 2009 01:52:10 +0000 (17:52 -0800)]
resolved conflicts for merge of
8915fd90 to eclair-mr2-plus-aosp
Xavier Ducrohet [Thu, 19 Nov 2009 01:14:02 +0000 (17:14 -0800)]
am
01d2087c: resolved conflicts for merge of
19cb54ea to eclair
Merge commit '
01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2
* commit '
01d2087c87627df5bfc7e684f62466e0a662197a':
Remove components that were moved to sdk.git and update build scripts.
Xavier Ducrohet [Thu, 19 Nov 2009 01:07:11 +0000 (17:07 -0800)]
resolved conflicts for merge of
19cb54ea to eclair
Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8
Dan Egnor [Wed, 18 Nov 2009 21:21:54 +0000 (13:21 -0800)]
am
1c563caa: am
e970b3d1: Add "common" runtest definition (for android-common library tests)
Merge commit '
1c563caad4700be1be5eec2dab6d13b3dcd34e51'
* commit '
1c563caad4700be1be5eec2dab6d13b3dcd34e51':
Add "common" runtest definition (for android-common library tests)
Dan Egnor [Wed, 18 Nov 2009 21:11:28 +0000 (13:11 -0800)]
am
e970b3d1: Add "common" runtest definition (for android-common library tests)
Merge commit '
e970b3d160719a58ef9c91c637eb5ec9dc95a3fe' into eclair-mr2-plus-aosp
* commit '
e970b3d160719a58ef9c91c637eb5ec9dc95a3fe':
Add "common" runtest definition (for android-common library tests)
Dan Egnor [Wed, 18 Nov 2009 20:05:35 +0000 (12:05 -0800)]
Add "common" runtest definition (for android-common library tests)
Xavier Ducrohet [Tue, 17 Nov 2009 23:11:59 +0000 (15:11 -0800)]
Remove components that were moved to sdk.git and update build scripts.
Raphael [Tue, 17 Nov 2009 15:34:58 +0000 (07:34 -0800)]
am
a7e42085: am
6ae0010c: am
20d03274: Merge change I6809bd44 into eclair
Merge commit '
a7e42085979affcc374fc15d7e86a1bf0a0f0176'
* commit '
a7e42085979affcc374fc15d7e86a1bf0a0f0176':
SDK Manager: XML Schema for sdk-repository v2
David 'Digit' Turner [Tue, 17 Nov 2009 15:32:35 +0000 (07:32 -0800)]
am
ca443267: am
5ad866dd: am
e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit '
ca4432676724e715caa50958383447ad2b65f02e'
* commit '
ca4432676724e715caa50958383447ad2b65f02e':
Update build-toolchain.sh to be able to build gcc 4.4.0
David 'Digit' Turner [Tue, 17 Nov 2009 15:32:31 +0000 (07:32 -0800)]
am
853340a6: am
245c4282: am
f3ec7a02: Merge change If72f81fb into eclair
Merge commit '
853340a697d6fbdb1dc06ea8ad8073f228c0aa1b'
* commit '
853340a697d6fbdb1dc06ea8ad8073f228c0aa1b':
Add a script to download and package the toolchain sources.
Raphael [Tue, 17 Nov 2009 15:32:15 +0000 (07:32 -0800)]
am
7371e184: am
12ed1a7d: am
5df7d75e: am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
7371e1847510e54995d4b1b1817370c3867bea52'
* commit '
7371e1847510e54995d4b1b1817370c3867bea52':
SDK Manager support for future schemas.
Raphael [Tue, 17 Nov 2009 04:00:32 +0000 (20:00 -0800)]
am
6ae0010c: am
20d03274: Merge change I6809bd44 into eclair
Merge commit '
6ae0010c61ed927ad715de4a75e140c932e1d86a' into eclair-mr2-plus-aosp
* commit '
6ae0010c61ed927ad715de4a75e140c932e1d86a':
SDK Manager: XML Schema for sdk-repository v2
Raphael [Tue, 17 Nov 2009 03:56:59 +0000 (19:56 -0800)]
am
20d03274: Merge change I6809bd44 into eclair
Merge commit '
20d0327492490b676a0a1036754e7742fb92bb69' into eclair-mr2
* commit '
20d0327492490b676a0a1036754e7742fb92bb69':
SDK Manager: XML Schema for sdk-repository v2
Android (Google) Code Review [Tue, 17 Nov 2009 03:39:13 +0000 (19:39 -0800)]
Merge change I6809bd44 into eclair
* changes:
SDK Manager: XML Schema for sdk-repository v2
Raphael [Tue, 17 Nov 2009 02:00:59 +0000 (18:00 -0800)]
SDK Manager: XML Schema for sdk-repository v2
v2 will be a full standalone schema, not reusing any parts of v1.
Each package type is now defined using a named type, which means
a v3 version would redifine the top element and could include
some named types of v2.
Unfortunately we cannot *extend* the top element from v1 because
extension in XML Schema seems to imply a sequence (i.e. fixed order)
whereas we use a "choice" mode to have 0..N of each types in any
order.
SDK BUG
2252825
Change-Id: I6809bd4486ef2d7f2473995ed5a0abb7fa377bdd
David 'Digit' Turner [Mon, 16 Nov 2009 23:03:39 +0000 (15:03 -0800)]
am
5ad866dd: am
e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit '
5ad866dd5dd886556be67b13e3138f979816f35a' into eclair-mr2-plus-aosp
* commit '
5ad866dd5dd886556be67b13e3138f979816f35a':
Update build-toolchain.sh to be able to build gcc 4.4.0
David 'Digit' Turner [Mon, 16 Nov 2009 23:03:34 +0000 (15:03 -0800)]
am
245c4282: am
f3ec7a02: Merge change If72f81fb into eclair
Merge commit '
245c4282dbccddc611dba1ff8a2575a33f9217b5' into eclair-mr2-plus-aosp
* commit '
245c4282dbccddc611dba1ff8a2575a33f9217b5':
Add a script to download and package the toolchain sources.
David 'Digit' Turner [Mon, 16 Nov 2009 22:59:15 +0000 (14:59 -0800)]
am
e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit '
e4df0ea14bcfc6e2d395e36970749cf9a916a0fb' into eclair-mr2
* commit '
e4df0ea14bcfc6e2d395e36970749cf9a916a0fb':
Update build-toolchain.sh to be able to build gcc 4.4.0
David 'Digit' Turner [Mon, 16 Nov 2009 22:59:11 +0000 (14:59 -0800)]
am
f3ec7a02: Merge change If72f81fb into eclair
Merge commit '
f3ec7a02777ed9fcbe995711b8cb3f31de01d274' into eclair-mr2
* commit '
f3ec7a02777ed9fcbe995711b8cb3f31de01d274':
Add a script to download and package the toolchain sources.
Android (Google) Code Review [Mon, 16 Nov 2009 22:53:57 +0000 (14:53 -0800)]
Merge change I8d8b5816 into eclair
* changes:
Update build-toolchain.sh to be able to build gcc 4.4.0
Android (Google) Code Review [Mon, 16 Nov 2009 22:53:45 +0000 (14:53 -0800)]
Merge change If72f81fb into eclair
* changes:
Add a script to download and package the toolchain sources.
Raphael [Mon, 16 Nov 2009 22:47:31 +0000 (14:47 -0800)]
am
f78995a8: am
eeef4416: am
6dcf4214: resolved conflicts for merge of
0da4f158 to eclair
Merge commit '
f78995a8eeb0006eba2d431c379e28aeac0b8b5b'
* commit '
f78995a8eeb0006eba2d431c379e28aeac0b8b5b':
SDK Manager: phase 1 of support for future schemas
Xavier Ducrohet [Mon, 16 Nov 2009 22:47:26 +0000 (14:47 -0800)]
am
237c3bc1: (-s ours) am
dd138bf1: am
a0ac4b14: (-s ours) am
b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '
237c3bc13181c1fb344a8c21af0417c5f86e26e3'
* commit '
237c3bc13181c1fb344a8c21af0417c5f86e26e3':
Rename the layout device from ION to ADP2. (do not merge)
Xavier Ducrohet [Mon, 16 Nov 2009 22:47:21 +0000 (14:47 -0800)]
am
a48826a4: am
8b633873: am
5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '
a48826a4a612a82714fa364af0cd21ace04b20bc'
* commit '
a48826a4a612a82714fa364af0cd21ace04b20bc':
Rename the layout device from ION to ADP2.
Raphael [Mon, 16 Nov 2009 22:44:58 +0000 (14:44 -0800)]
am
12ed1a7d: am
5df7d75e: am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
12ed1a7d9a72fa16cb677027e1cea65206550a22' into eclair-mr2-plus-aosp
* commit '
12ed1a7d9a72fa16cb677027e1cea65206550a22':
SDK Manager support for future schemas.
Raphael [Mon, 16 Nov 2009 22:41:03 +0000 (14:41 -0800)]
am
eeef4416: am
6dcf4214: resolved conflicts for merge of
0da4f158 to eclair
Merge commit '
eeef441637736156e7899ddf2de8ddb7cb197cc9' into eclair-mr2-plus-aosp
* commit '
eeef441637736156e7899ddf2de8ddb7cb197cc9':
SDK Manager: phase 1 of support for future schemas
Xavier Ducrohet [Mon, 16 Nov 2009 22:40:59 +0000 (14:40 -0800)]
am
dd138bf1: am
a0ac4b14: (-s ours) am
b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '
dd138bf16096156754a0d3d7c94c3800bbc046d6' into eclair-mr2-plus-aosp
* commit '
dd138bf16096156754a0d3d7c94c3800bbc046d6':
Rename the layout device from ION to ADP2. (do not merge)
Xavier Ducrohet [Mon, 16 Nov 2009 22:40:00 +0000 (14:40 -0800)]
am
8b633873: am
5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '
8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp
* commit '
8b6338739b0be74baf3429c3276c5fe9bffb5b5b':
Rename the layout device from ION to ADP2.
Raphael [Mon, 16 Nov 2009 22:29:40 +0000 (14:29 -0800)]
am
5df7d75e: am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-mr2
* commit '
5df7d75e1c9cc73b4fe0111f89f099e8dba3486b':
SDK Manager support for future schemas.
Raphael [Mon, 16 Nov 2009 22:25:49 +0000 (14:25 -0800)]
am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair
* commit '
f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
SDK Manager support for future schemas.
Raphael [Mon, 16 Nov 2009 21:51:15 +0000 (13:51 -0800)]
SDK Manager support for future schemas.
This CL cleans up the v2 test by removing all v2 stuff
from the code right now. We only keep the part that
handles future schemas and right now the latest version is 1.
Change-Id: I31e6aeaf0582e94c67e1cc8317bec479ea7a52e7
Raphael [Mon, 16 Nov 2009 21:18:41 +0000 (13:18 -0800)]
am
6dcf4214: resolved conflicts for merge of
0da4f158 to eclair
Merge commit '
6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2
* commit '
6dcf42149b183e2a2a062c90d60a2803cf01523a':
SDK Manager: phase 1 of support for future schemas
Raphael [Mon, 16 Nov 2009 21:06:54 +0000 (13:06 -0800)]
resolved conflicts for merge of
0da4f158 to eclair
Fixes a merge eclair-sdk => eclair conflict of
SDK Manager: phase 1 of support for future schemas
SDK BUG
2252825
Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8
Xavier Ducrohet [Mon, 16 Nov 2009 20:54:36 +0000 (12:54 -0800)]
am
a0ac4b14: (-s ours) am
b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '
a0ac4b1492ae742e2f12138b647ea9781054a1b0' into eclair-mr2
* commit '
a0ac4b1492ae742e2f12138b647ea9781054a1b0':
Rename the layout device from ION to ADP2. (do not merge)
Android (Google) Code Review [Mon, 16 Nov 2009 20:53:09 +0000 (12:53 -0800)]
Merge change If1bda264 into eclair-sdk
* changes:
SDK Manager: phase 1 of support for future schemas
Xavier Ducrohet [Mon, 16 Nov 2009 20:50:17 +0000 (12:50 -0800)]
am
b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '
b624370d795cd1e17fcd9960c98c01463c23757f' into eclair
* commit '
b624370d795cd1e17fcd9960c98c01463c23757f':
Rename the layout device from ION to ADP2. (do not merge)
David 'Digit' Turner [Mon, 16 Nov 2009 19:39:52 +0000 (11:39 -0800)]
Update build-toolchain.sh to be able to build gcc 4.4.0
Update the script used to build the prebuilt toolchain binaries.
There are now two ways to use it:
1/ As usual, just invoke it and it will download the source tarball,
uncompress it, configure the toolchain sources, build them, then
package the result into a 'prebuilt' tarball.
2/ Generate a new source tarball with the 'download-toolchain-sources.sh'
script, and invoke build-toolchain.sh with the --package=<tarball>
option.
Additionally, you can now specify --gcc-version=4.4.0 to build GCC 4.4.0
(with ARMv7 / FPU support)
The option --gdb-version=6.8 has been added but the build doesn't seem
to work yet. This will probably be fixed in the toolchain git repository
though.
This will be used to refresh the NDK with gcc 4.4.0 prebuilts and support
for armeabi-v7a soon.
Raphael [Sun, 15 Nov 2009 05:30:27 +0000 (21:30 -0800)]
SDK Manager: phase 1 of support for future schemas
This is phase 1 of the support for future schemas:
- introduces a new v2 of the XSD
- handles an unknown XSD and extract its tools elements after
some hand checks.
TODO in phase 2:
- we still need to iron out the details of the sample node.
- there's no support for samples yet... this commit is not
about switching the sample code support to the new structure.
- there's no indication to the user that we are handling a new
schema... there should be some visual clue on why only the
tools are shown.
SDK BUG
2252825
Change-Id: If1bda26414cfe15275063d3187a98be6301d2992
Xavier Ducrohet [Mon, 16 Nov 2009 19:32:34 +0000 (11:32 -0800)]
am
5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '
5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-mr2
* commit '
5f9e0abed17ab1197a0868729232cb2c2024cef2':
Rename the layout device from ION to ADP2.
David 'Digit' Turner [Mon, 16 Nov 2009 19:26:06 +0000 (11:26 -0800)]
Add a script to download and package the toolchain sources.
download-toolchain-sources.sh will download the current toolchain sources
from our git repositories then finely package them into a compressed
tarball that will later be used to rebuild the prebuilt binaries properly.
Due to the way our sources are stored in the git repository, the sources
in the tarball are laid out slightly differently than in the original toolchain
source archive used for NDK 1.6.
An upcoming patch will modify build-toolchain.sh to deal with the difference
and also allow the build of gcc-4.4.0 and gdb-6.8.
Xavier Ducrohet [Mon, 16 Nov 2009 01:02:26 +0000 (17:02 -0800)]
Rename the layout device from ION to ADP2. (do not merge)
This is integrated from Eclair.
Android (Google) Code Review [Mon, 16 Nov 2009 19:21:10 +0000 (11:21 -0800)]
Merge change I5a66bbdf into eclair
* changes:
Rename the layout device from ION to ADP2.
Xavier Ducrohet [Mon, 16 Nov 2009 01:02:26 +0000 (17:02 -0800)]
Rename the layout device from ION to ADP2.
Change-Id: I5a66bbdf68772504cac2379ea85edb88c77f2fde
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:01:13 +0000 (15:01 -0800)]
am
c02bfe5e: merge from open-source master
Merge commit '
c02bfe5e77b84b82f3830f00554be5e735486850'
* commit '
c02bfe5e77b84b82f3830f00554be5e735486850':
eclair snapshot
Part 2 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
Part 1 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
Xavier Ducrohet [Sun, 15 Nov 2009 23:01:09 +0000 (15:01 -0800)]
am
c68f8c10: am
8507ead2: am
13dbc227: Merge change I62823795 into eclair
Merge commit '
c68f8c10f49e110b9b731d5f0c96acaf564b8ed5'
* commit '
c68f8c10f49e110b9b731d5f0c96acaf564b8ed5':
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 23:01:04 +0000 (15:01 -0800)]
am
aab6b89d: am
2e533cc0: am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
aab6b89debd56304b2fdde39292f36149a11f728'
* commit '
aab6b89debd56304b2fdde39292f36149a11f728':
Move source.properties for platform in sync with 2.0.1
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:58:37 +0000 (14:58 -0800)]
merge from open-source master
Xavier Ducrohet [Sun, 15 Nov 2009 22:55:20 +0000 (14:55 -0800)]
am
8507ead2: am
13dbc227: Merge change I62823795 into eclair
Merge commit '
8507ead2e565728e53e6f3c54be05fd21baab7d2' into eclair-mr2-plus-aosp
* commit '
8507ead2e565728e53e6f3c54be05fd21baab7d2':
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:55:10 +0000 (14:55 -0800)]
am
2e533cc0: am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
2e533cc0448af6e2add7ab346ff451dde79c1ced' into eclair-mr2-plus-aosp
* commit '
2e533cc0448af6e2add7ab346ff451dde79c1ced':
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:50:49 +0000 (14:50 -0800)]
am
13dbc227: Merge change I62823795 into eclair
Merge commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-mr2
* commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:50:44 +0000 (14:50 -0800)]
am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-mr2
* commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
Android (Google) Code Review [Sun, 15 Nov 2009 22:07:51 +0000 (14:07 -0800)]
Merge change Ia9788cd9
* changes:
Cleaning up source.android.com files.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:05:57 +0000 (14:05 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Xavier Ducrohet [Sun, 15 Nov 2009 21:25:03 +0000 (13:25 -0800)]
am
13dbc227: Merge change I62823795 into eclair
Merge commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-plus-aosp
* commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Android (Google) Code Review [Sun, 15 Nov 2009 21:22:41 +0000 (13:22 -0800)]
Merge change I62823795 into eclair
* changes:
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 21:18:30 +0000 (13:18 -0800)]
am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-plus-aosp
* commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 21:16:01 +0000 (13:16 -0800)]
Move source.properties for doc in sync with 2.0.1
Change-Id: I6282379532159de597aaec50cad81b14a0c895ce
Android (Google) Code Review [Sun, 15 Nov 2009 21:14:47 +0000 (13:14 -0800)]
Merge change I229c60a9 into eclair
* changes:
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 20:52:56 +0000 (12:52 -0800)]
Move source.properties for platform in sync with 2.0.1
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:05:38 +0000 (12:05 -0800)]
merge from eclair
Dan Morrill [Sun, 15 Nov 2009 19:49:30 +0000 (11:49 -0800)]
Cleaning up source.android.com files.
This change fixes some formatting artifacts that resulted from the export from
Sites, and also updates links to no longer point to Sites and use the standard
{@docRoot} idiom. Also contains a few content updates, and introduces a page
about branch management.
Raphael [Sat, 14 Nov 2009 23:01:55 +0000 (15:01 -0800)]
am
30f366d2: am
1ef75694: am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
30f366d23217cb71181353010464e99c9b42115f'
* commit '
30f366d23217cb71181353010464e99c9b42115f':
SDK Manager: fix, create temp folder before download
Raphael [Sat, 14 Nov 2009 22:55:28 +0000 (14:55 -0800)]
am
1ef75694: am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
1ef756940f7292987a32eeab656fc8737171dc03' into eclair-mr2-plus-aosp
* commit '
1ef756940f7292987a32eeab656fc8737171dc03':
SDK Manager: fix, create temp folder before download
Raphael [Sat, 14 Nov 2009 22:50:13 +0000 (14:50 -0800)]
am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
e5387db7c2dabc9954434494054295f45e86e312' into eclair-plus-aosp
* commit '
e5387db7c2dabc9954434494054295f45e86e312':
SDK Manager: fix, create temp folder before download
Raphael [Sat, 14 Nov 2009 22:49:14 +0000 (14:49 -0800)]
am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
e5387db7c2dabc9954434494054295f45e86e312' into eclair-mr2
* commit '
e5387db7c2dabc9954434494054295f45e86e312':
SDK Manager: fix, create temp folder before download
Raphael [Sat, 14 Nov 2009 22:39:52 +0000 (14:39 -0800)]
am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
d2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair
* commit '
d2ad5e31b829f609c76f2352cbdb964c0a4434e6':
SDK Manager: fix, create temp folder before download
Android (Google) Code Review [Sat, 14 Nov 2009 22:32:27 +0000 (14:32 -0800)]
Merge change I361fb688 into eclair-sdk
* changes:
SDK Manager: fix, create temp folder before download
Brett Chabot [Sat, 14 Nov 2009 03:06:44 +0000 (19:06 -0800)]
Brett Chabot [Sat, 14 Nov 2009 03:03:51 +0000 (19:03 -0800)]
am
30a6db9c: am
36449a1e: Merge change Ic2680af0 into eclair
Merge commit '
30a6db9cf31c95a6329170dfd5de2e27cfe47b16' into eclair-mr2-plus-aosp
* commit '
30a6db9cf31c95a6329170dfd5de2e27cfe47b16':
Cleanup for coverage.
Brett Chabot [Sat, 14 Nov 2009 03:00:14 +0000 (19:00 -0800)]
am
36449a1e: Merge change Ic2680af0 into eclair
Merge commit '
36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-mr2
* commit '
36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
Cleanup for coverage.
Brett Chabot [Sat, 14 Nov 2009 02:59:55 +0000 (18:59 -0800)]
am
36449a1e: Merge change Ic2680af0 into eclair
Merge commit '
36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-plus-aosp
* commit '
36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
Cleanup for coverage.
Android (Google) Code Review [Sat, 14 Nov 2009 02:55:47 +0000 (18:55 -0800)]
Merge change Ic2680af0 into eclair
* changes:
Cleanup for coverage.
Brett Chabot [Sat, 14 Nov 2009 02:33:43 +0000 (18:33 -0800)]
Cleanup for coverage.
Fix constructor call in coverage.py
Remove obsolete improvider from coverage targets.
Change-Id: Ic2680af0aa84c705a6bc05a897461eeeaeeeb1cc
Eric Fischer [Sat, 14 Nov 2009 02:03:40 +0000 (18:03 -0800)]
am
60f045e3: am
9c002e9f: am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
60f045e3b3fb49bceb85389fdaadcaa8b6e17ee6'
* commit '
60f045e3b3fb49bceb85389fdaadcaa8b6e17ee6':
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:59:44 +0000 (17:59 -0800)]
am
9c002e9f: am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
9c002e9f7a90a769b0656e060d4ec6a0401d7927' into eclair-mr2-plus-aosp
* commit '
9c002e9f7a90a769b0656e060d4ec6a0401d7927':
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:54:56 +0000 (17:54 -0800)]
am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
d5165a4b6709a68fc099c8acdf4dfe4b7120adcf' into eclair-mr2
* commit '
d5165a4b6709a68fc099c8acdf4dfe4b7120adcf':
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:53:36 +0000 (17:53 -0800)]
am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
d5165a4b6709a68fc099c8acdf4dfe4b7120adcf' into eclair-plus-aosp
* commit '
d5165a4b6709a68fc099c8acdf4dfe4b7120adcf':
Import revised translations.
Android (Google) Code Review [Sat, 14 Nov 2009 01:49:55 +0000 (17:49 -0800)]
Merge change I00c840bb into eclair
* changes:
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:11:59 +0000 (17:11 -0800)]
Import revised translations.
Approver: jerryw
Xavier Ducrohet [Sat, 14 Nov 2009 00:41:32 +0000 (16:41 -0800)]
am
1591827e: (-s ours) am
37339c2a: am
b92c8a90: (-s ours) am
7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '
1591827e470544eff8057b61c0be51acb8b57b95'
* commit '
1591827e470544eff8057b61c0be51acb8b57b95':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Sat, 14 Nov 2009 00:35:35 +0000 (16:35 -0800)]
am
37339c2a: am
b92c8a90: (-s ours) am
7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '
37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a' into eclair-mr2-plus-aosp
* commit '
37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Sat, 14 Nov 2009 00:32:07 +0000 (16:32 -0800)]
am
b92c8a90: (-s ours) am
7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '
b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-mr2
* commit '
b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Sat, 14 Nov 2009 00:31:33 +0000 (16:31 -0800)]
am
b92c8a90: am
7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '
b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-plus-aosp
* commit '
b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Sat, 14 Nov 2009 00:27:51 +0000 (16:27 -0800)]
am
7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '
7e48a7003ad28f8b45a45a24fc479b3a237727f1' into eclair
* commit '
7e48a7003ad28f8b45a45a24fc479b3a237727f1':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Thu, 12 Nov 2009 21:25:09 +0000 (13:25 -0800)]
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
BUG
2256562
This is integrated from eclair
Xavier Ducrohet [Fri, 13 Nov 2009 23:54:50 +0000 (15:54 -0800)]
am
d4929cfa: am
250153e8: am
25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '
d4929cfa19edd45f5b819400c5e221a2687a294d'
* commit '
d4929cfa19edd45f5b819400c5e221a2687a294d':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Xavier Ducrohet [Fri, 13 Nov 2009 23:50:56 +0000 (15:50 -0800)]
am
250153e8: am
25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '
250153e8257188269bb171bb333975860bcc1d36' into eclair-mr2-plus-aosp
* commit '
250153e8257188269bb171bb333975860bcc1d36':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Xavier Ducrohet [Fri, 13 Nov 2009 23:46:56 +0000 (15:46 -0800)]
am
25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '
25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2
* commit '
25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Xavier Ducrohet [Fri, 13 Nov 2009 23:46:34 +0000 (15:46 -0800)]
am
25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '
25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-plus-aosp
* commit '
25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Android (Google) Code Review [Fri, 13 Nov 2009 23:42:46 +0000 (15:42 -0800)]
Merge change I9a181cb7 into eclair
* changes:
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Android (Google) Code Review [Fri, 13 Nov 2009 23:31:49 +0000 (15:31 -0800)]
Merge change I9bdf6690
* changes:
Forces adb root and remount when syncing.
Android (Google) Code Review [Fri, 13 Nov 2009 23:31:23 +0000 (15:31 -0800)]
Merge change If6f5beaf
* changes:
Improved the search to catch warnings from the build subprocess.
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:45:17 +0000 (18:45 -0800)]
eclair snapshot
Android Git Automerger [Fri, 13 Nov 2009 21:15:32 +0000 (13:15 -0800)]
am
fc6e75e5: am
228bbae1: am
e259566c: Put this change back, false alert with build breakage
Merge commit '
fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0'
* commit '
fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0':
Put this change back, false alert with build breakage
Android Git Automerger [Fri, 13 Nov 2009 21:11:09 +0000 (13:11 -0800)]
am
228bbae1: am
e259566c: Put this change back, false alert with build breakage
Merge commit '
228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp
* commit '
228bbae1e312c525f52648d2ff4f4ed597d82a7b':
Put this change back, false alert with build breakage
Android Git Automerger [Fri, 13 Nov 2009 21:06:11 +0000 (13:06 -0800)]
am
e259566c: Put this change back, false alert with build breakage
Merge commit '
e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2
* commit '
e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Android Git Automerger [Fri, 13 Nov 2009 20:30:30 +0000 (12:30 -0800)]
am
e259566c: Put this change back, false alert with build breakage
Merge commit '
e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-plus-aosp
* commit '
e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Android Git Automerger [Fri, 13 Nov 2009 20:26:06 +0000 (12:26 -0800)]
Put this change back, false alert with build breakage
This reverts commit
a9046e418e539e208af6f3723a513666074ec6a1.
Android Git Automerger [Fri, 13 Nov 2009 19:58:41 +0000 (11:58 -0800)]
am
2c97ad64: am
0bf9cdf5: am
a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Merge commit '
2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d'
* commit '
2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."