OSDN Git Service
Jack Palevich [Tue, 29 Dec 2009 11:04:13 +0000 (19:04 +0800)]
Add libETC1 to the prelink map.
libETC1 is a library for compressing and
decompressing images in the ETC1 format.
This is a common texture format for OpenGL ES 2.0
GPUs.
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:50:18 +0000 (15:50 -0800)]
resolved conflicts for merge of
a7bfdbf2 to master
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:31:49 +0000 (15:31 -0800)]
merge from open-source master
Jean-Baptiste Queru [Fri, 18 Dec 2009 01:47:28 +0000 (17:47 -0800)]
Add all-html-files-under
This allows to run droiddoc on only a specific set of subdirectories
instead of using all subdirectories.
Change-Id: I6b5daa31f6ce6801705a5c87bd05ea0e4e8c5d88
Brett Chabot [Fri, 18 Dec 2009 00:40:56 +0000 (16:40 -0800)]
am
d5cf3a95: am
1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '
d5cf3a95cce2d9699d2c3f5998d51302f51aa03c'
* commit '
d5cf3a95cce2d9699d2c3f5998d51302f51aa03c':
Add CTS accounts tests to CTS makefile.
Brett Chabot [Fri, 18 Dec 2009 00:38:04 +0000 (16:38 -0800)]
am
1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '
1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp
* commit '
1e43c510758439b3195597056121c59b71481254':
Add CTS accounts tests to CTS makefile.
Brett Chabot [Thu, 17 Dec 2009 23:14:40 +0000 (15:14 -0800)]
Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
Andreas Huber [Thu, 17 Dec 2009 22:03:12 +0000 (14:03 -0800)]
Squashed commit of the following:
commit
b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 14:00:37 2009 -0800
Update cleanspec to facilitate incremental building with full stagefright lib.
commit
b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 13:31:48 2009 -0800
Enable building stagefright in all builds, make stagefright the default player.
Jeff Hamilton [Thu, 17 Dec 2009 21:35:37 +0000 (15:35 -0600)]
Cleanspecs from Ed to cleanup after my previous name change.
Jeff Hamilton [Thu, 17 Dec 2009 21:25:19 +0000 (15:25 -0600)]
Switch the platform name from Eclair-MR2 to Froyo.
Scott Main [Thu, 17 Dec 2009 05:43:46 +0000 (21:43 -0800)]
am
b0c21911: am
99a25fba: Merge change I92c7fe59 into eclair
Merge commit '
b0c219115533fe94056d4498603ce8e474e1b9a0'
* commit '
b0c219115533fe94056d4498603ce8e474e1b9a0':
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:40:55 +0000 (21:40 -0800)]
am
99a25fba: Merge change I92c7fe59 into eclair
Merge commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp
* commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b':
docs: change DOCTYPE to html5 format
Android (Google) Code Review [Thu, 17 Dec 2009 05:38:02 +0000 (21:38 -0800)]
Merge change I92c7fe59 into eclair
* changes:
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:36:15 +0000 (21:36 -0800)]
docs: change DOCTYPE to html5 format
Android (Google) Code Review [Thu, 17 Dec 2009 00:11:15 +0000 (16:11 -0800)]
Merge change I32b3795d
* changes:
add Provision to the generic build
Scott Main [Wed, 16 Dec 2009 23:52:41 +0000 (15:52 -0800)]
am
d79b160d: am
ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit '
d79b160d90450068237282393be0d7456cb14bc1'
* commit '
d79b160d90450068237282393be0d7456cb14bc1':
docs for esr: add support for breadcrumbing in the resource docs
Scott Main [Wed, 16 Dec 2009 23:44:37 +0000 (15:44 -0800)]
am
ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp
* commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
docs for esr: add support for breadcrumbing in the resource docs
Scott Main [Wed, 16 Dec 2009 23:36:20 +0000 (15:36 -0800)]
docs for esr: add support for breadcrumbing in the resource docs
Jean-Baptiste Queru [Wed, 16 Dec 2009 18:29:18 +0000 (10:29 -0800)]
add Provision to the generic build
Change-Id: I32b3795dd147c2615186b615525c4f75e0728e19
Dirk Dougherty [Wed, 16 Dec 2009 07:31:15 +0000 (23:31 -0800)]
am
930ca65a: am
8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '
930ca65a3cde0bf0817e38efee5772338abbf0c0'
* commit '
930ca65a3cde0bf0817e38efee5772338abbf0c0':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 03:29:52 +0000 (19:29 -0800)]
am
8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp
* commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Android (Google) Code Review [Wed, 16 Dec 2009 03:26:48 +0000 (19:26 -0800)]
Merge change Ib471b5b2 into eclair
* changes:
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 02:48:38 +0000 (18:48 -0800)]
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:
2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
Doug Zongker [Wed, 16 Dec 2009 01:27:49 +0000 (17:27 -0800)]
map -e with no cert to PRESIGNED
Needed for backwards compatibility with scripts that use -e.
Android (Google) Code Review [Tue, 15 Dec 2009 23:51:10 +0000 (15:51 -0800)]
Merge change If6a53aa5
* changes:
add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Doug Zongker [Tue, 15 Dec 2009 23:06:55 +0000 (15:06 -0800)]
add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing. (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
Xavier Ducrohet [Tue, 15 Dec 2009 23:05:54 +0000 (15:05 -0800)]
am
6f6b2090: am
920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '
6f6b2090cfb981b0c52b0c9271753968a6e94cc2'
* commit '
6f6b2090cfb981b0c52b0c9271753968a6e94cc2':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 23:03:19 +0000 (15:03 -0800)]
am
374909f6: am
fac84b56: Merge change Icb5cf14e into eclair
Merge commit '
374909f68a78941909ecd0b6a329822fdd01cac5'
* commit '
374909f68a78941909ecd0b6a329822fdd01cac5':
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 23:03:15 +0000 (15:03 -0800)]
am
c1cd624b: am
88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '
c1cd624b3a4c0528ea386a12f20b6049f12c3858'
* commit '
c1cd624b3a4c0528ea386a12f20b6049f12c3858':
Add gallery to the SDK build now that it's split from the Camera app.
Dirk Dougherty [Tue, 15 Dec 2009 23:03:11 +0000 (15:03 -0800)]
am
7b0e85e1: am
502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '
7b0e85e1814376286c7d036f73241f9a19f70b08'
* commit '
7b0e85e1814376286c7d036f73241f9a19f70b08':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Xavier Ducrohet [Tue, 15 Dec 2009 18:33:15 +0000 (10:33 -0800)]
am
920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b' into eclair-plus-aosp
* commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 15:42:24 +0000 (07:42 -0800)]
am
fac84b56: Merge change Icb5cf14e into eclair
Merge commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp
* commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c':
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 15:41:17 +0000 (07:41 -0800)]
am
88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570' into eclair-plus-aosp
* commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570':
Add gallery to the SDK build now that it's split from the Camera app.
Dirk Dougherty [Tue, 15 Dec 2009 15:38:57 +0000 (07:38 -0800)]
am
502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '
502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp
* commit '
502c498fec23cb28d16f5e86e981400f76da36ea':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Android Git Automerger [Tue, 15 Dec 2009 08:44:45 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Xavier Ducrohet [Tue, 15 Dec 2009 06:37:13 +0000 (22:37 -0800)]
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Change-Id: I5a1b0d2e383b757e52879792ee80dbd61f97f9a4
Android (Google) Code Review [Tue, 15 Dec 2009 02:20:10 +0000 (18:20 -0800)]
Merge change Icb5cf14e into eclair
* changes:
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 01:55:05 +0000 (17:55 -0800)]
Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Xavier Ducrohet [Tue, 15 Dec 2009 00:46:05 +0000 (16:46 -0800)]
Add gallery to the SDK build now that it's split from the Camera app.
Bug:
2275030
Change-Id: Iad74a37d0df1d77185062cb4323665be7185c242
Doug Zongker [Mon, 14 Dec 2009 23:33:14 +0000 (15:33 -0800)]
am
4cac8afc: am
714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '
4cac8afc21a356ce3ca074f12383cf1526d44156'
* commit '
4cac8afc21a356ce3ca074f12383cf1526d44156':
include pre-signed prebuilt .apks in apkcerts.txt
Doug Zongker [Mon, 14 Dec 2009 23:24:22 +0000 (15:24 -0800)]
am
714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '
714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp
* commit '
714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
Doug Zongker [Mon, 14 Dec 2009 17:56:19 +0000 (09:56 -0800)]
include pre-signed prebuilt .apks in apkcerts.txt
Dirk Dougherty [Thu, 3 Dec 2009 02:01:16 +0000 (18:01 -0800)]
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug:
2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
Doug Zongker [Fri, 11 Dec 2009 23:01:40 +0000 (15:01 -0800)]
am
39ecb46e: am
9bc88726: Merge change I45302ff0 into eclair-mr2
Merge commit '
39ecb46ed1c124e4d3e3ebb594a62b65984483ac'
* commit '
39ecb46ed1c124e4d3e3ebb594a62b65984483ac':
make prebuilt .apks require LOCAL_CERTIFICATE
Doug Zongker [Fri, 11 Dec 2009 22:54:54 +0000 (14:54 -0800)]
am
9bc88726: Merge change I45302ff0 into eclair-mr2
Merge commit '
9bc88726cb24e92007d42c126ec094e687b3905f' into eclair-mr2-plus-aosp
* commit '
9bc88726cb24e92007d42c126ec094e687b3905f':
make prebuilt .apks require LOCAL_CERTIFICATE
Android (Google) Code Review [Fri, 11 Dec 2009 22:50:33 +0000 (14:50 -0800)]
Merge change I45302ff0 into eclair-mr2
* changes:
make prebuilt .apks require LOCAL_CERTIFICATE
Doug Zongker [Fri, 11 Dec 2009 21:50:35 +0000 (13:50 -0800)]
make prebuilt .apks require LOCAL_CERTIFICATE
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
Scott Main [Fri, 11 Dec 2009 07:41:29 +0000 (23:41 -0800)]
am
be4eca18: am
f7b3211e: am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'
* commit '
be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
docs: add "figure" class for DIV elements that contain
Ying Wang [Fri, 11 Dec 2009 07:41:26 +0000 (23:41 -0800)]
Scott Main [Fri, 11 Dec 2009 01:52:19 +0000 (17:52 -0800)]
am
f7b3211e: am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp
* commit '
f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
docs: add "figure" class for DIV elements that contain
Ying Wang [Fri, 11 Dec 2009 01:52:12 +0000 (17:52 -0800)]
am
92e2d3e2: am
6ef046c8: Fixes ProGuard options.
Merge commit '
92e2d3e206a301a090d90e8c61d85e88fdc35a71' into eclair-mr2-plus-aosp
* commit '
92e2d3e206a301a090d90e8c61d85e88fdc35a71':
Fixes ProGuard options.
Scott Main [Fri, 11 Dec 2009 01:44:38 +0000 (17:44 -0800)]
am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-mr2
* commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
Ying Wang [Fri, 11 Dec 2009 01:39:53 +0000 (17:39 -0800)]
am
6ef046c8: Fixes ProGuard options.
Merge commit '
6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2
* commit '
6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
Doug Zongker [Thu, 10 Dec 2009 22:41:49 +0000 (14:41 -0800)]
am
c9806cfd: am
bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
Merge commit '
c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd'
* commit '
c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd':
remove shared_uid cert check from sign_targt_file_apks
Doug Zongker [Thu, 10 Dec 2009 22:41:20 +0000 (14:41 -0800)]
am
a492ecce: am
fe8ff19a: Merge change Ief993a27 into eclair-mr2
Merge commit '
a492ecce759417b965f93edcc40919866240d581'
* commit '
a492ecce759417b965f93edcc40919866240d581':
add signing checker script to releasetools
Doug Zongker [Thu, 10 Dec 2009 22:38:10 +0000 (14:38 -0800)]
am
23c1f0ca: am
5ae770fc: add option to @hide classes generated from .logtags files
Merge commit '
23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5'
* commit '
23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5':
add option to @hide classes generated from .logtags files
Doug Zongker [Thu, 10 Dec 2009 19:44:09 +0000 (11:44 -0800)]
am
bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
Merge commit '
bbfb96f46472c74e2dbdd190fb67cdda13347eb4' into eclair-mr2-plus-aosp
* commit '
bbfb96f46472c74e2dbdd190fb67cdda13347eb4':
remove shared_uid cert check from sign_targt_file_apks
Doug Zongker [Thu, 10 Dec 2009 19:22:57 +0000 (11:22 -0800)]
remove shared_uid cert check from sign_targt_file_apks
This check (and others) are now done by the separate script
check_target_files_signatures; the one here is redundant.
Doug Zongker [Thu, 10 Dec 2009 17:42:10 +0000 (09:42 -0800)]
am
fe8ff19a: Merge change Ief993a27 into eclair-mr2
Merge commit '
fe8ff19a2a0698d43868c86b5cead0553bdef8ea' into eclair-mr2-plus-aosp
* commit '
fe8ff19a2a0698d43868c86b5cead0553bdef8ea':
add signing checker script to releasetools
Android (Google) Code Review [Thu, 10 Dec 2009 17:37:19 +0000 (09:37 -0800)]
Merge change Ief993a27 into eclair-mr2
* changes:
add signing checker script to releasetools
Jean-Baptiste Queru [Thu, 10 Dec 2009 17:31:28 +0000 (09:31 -0800)]
manual merge
Ravi K Yenduri [Thu, 10 Dec 2009 09:34:19 +0000 (15:04 +0530)]
Enable building for simulator
Scott Main [Thu, 10 Dec 2009 02:17:50 +0000 (18:17 -0800)]
am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp
* commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
Android (Google) Code Review [Thu, 10 Dec 2009 02:13:09 +0000 (18:13 -0800)]
Merge change I483cf38d into eclair
* changes:
docs: add "figure" class for DIV elements that contain a figure image with caption text.
Scott Main [Thu, 10 Dec 2009 02:08:32 +0000 (18:08 -0800)]
docs: add "figure" class for DIV elements that contain
a figure image with caption text.
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
Doug Zongker [Thu, 10 Dec 2009 00:01:33 +0000 (16:01 -0800)]
am
5ae770fc: add option to @hide classes generated from .logtags files
Merge commit '
5ae770fc0e43172e1efc5146a38e7d1f452143e2' into eclair-mr2-plus-aosp
* commit '
5ae770fc0e43172e1efc5146a38e7d1f452143e2':
add option to @hide classes generated from .logtags files
Jean-Baptiste Queru [Wed, 9 Dec 2009 23:54:11 +0000 (15:54 -0800)]
am
3a59b2ce: Remove Google-specific files
Merge commit '
3a59b2ceb9fee68eef0428e5458edfbb9e09936c' into eclair-mr2-plus-aosp
* commit '
3a59b2ceb9fee68eef0428e5458edfbb9e09936c':
Remove Google-specific files
Jean-Baptiste Queru [Wed, 9 Dec 2009 23:54:07 +0000 (15:54 -0800)]
am
6254132a: remove old p4->git import history
Merge commit '
6254132a3e1a850231f51cbead46891ced7aa083' into eclair-mr2-plus-aosp
* commit '
6254132a3e1a850231f51cbead46891ced7aa083':
remove old p4->git import history
Ying Wang [Wed, 9 Dec 2009 22:59:19 +0000 (14:59 -0800)]
am
6ef046c8: Fixes ProGuard options.
Merge commit '
6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp
* commit '
6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
Ying Wang [Tue, 8 Dec 2009 02:14:00 +0000 (18:14 -0800)]
Fixes ProGuard options.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
Doug Zongker [Tue, 8 Dec 2009 20:45:02 +0000 (12:45 -0800)]
add option to @hide classes generated from .logtags files
Generate a javadoc @hide comment on the class when "option
javadoc_hide true" is specified in the input .logtags file.
Doug Zongker [Tue, 8 Dec 2009 21:46:44 +0000 (13:46 -0800)]
add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files. It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
Jean-Baptiste Queru [Tue, 8 Dec 2009 23:11:04 +0000 (15:11 -0800)]
Remove Google-specific files
Also remove unused configuration
Scott Main [Tue, 8 Dec 2009 22:51:26 +0000 (14:51 -0800)]
am
0be5c863: am
a2496682: am
9b0ad4c7: Merge change I79580117 into eclair
Merge commit '
0be5c863a204cc37fda35574c3111ac363b26b17'
* commit '
0be5c863a204cc37fda35574c3111ac363b26b17':
docs: add context coloring to code snippets with prettify script
Jean-Baptiste Queru [Tue, 8 Dec 2009 22:02:18 +0000 (14:02 -0800)]
remove old p4->git import history
Mike Lockwood [Tue, 8 Dec 2009 02:32:14 +0000 (18:32 -0800)]
am
b1665953: am
623a5572: resolved conflicts for merge of
882ad42e to eclair-mr2
Merge commit '
b16659533e55476bbe2c0b177943ef8f4129e34a'
* commit '
b16659533e55476bbe2c0b177943ef8f4129e34a':
Add clean step for switching GPS API from pdapi to loc_api
Scott Main [Tue, 8 Dec 2009 00:39:04 +0000 (16:39 -0800)]
am
a2496682: am
9b0ad4c7: Merge change I79580117 into eclair
Merge commit '
a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp
* commit '
a2496682f9c6f9311199df7300bb8e16298cf40d':
docs: add context coloring to code snippets with prettify script
Scott Main [Tue, 8 Dec 2009 00:34:01 +0000 (16:34 -0800)]
am
9b0ad4c7: Merge change I79580117 into eclair
Merge commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-mr2
* commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
docs: add context coloring to code snippets with prettify script
Scott Main [Tue, 8 Dec 2009 00:33:18 +0000 (16:33 -0800)]
am
9b0ad4c7: Merge change I79580117 into eclair
Merge commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp
* commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
docs: add context coloring to code snippets with prettify script
Android (Google) Code Review [Tue, 8 Dec 2009 00:29:47 +0000 (16:29 -0800)]
Merge change I79580117 into eclair
* changes:
docs: add context coloring to code snippets with prettify script
Bjorn Bringert [Mon, 7 Dec 2009 22:58:53 +0000 (14:58 -0800)]
am
fe8ab167: am
e15968b4: Clean step for the move of SearchableInfo to android.app
Merge commit '
fe8ab167caa0fb93d068a6f93932f9ce3115c327'
* commit '
fe8ab167caa0fb93d068a6f93932f9ce3115c327':
Clean step for the move of SearchableInfo to android.app
Doug Zongker [Mon, 7 Dec 2009 22:58:50 +0000 (14:58 -0800)]
am
e1f8ec91: am
56a01cbb: am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
e1f8ec918e5e257feb0f6d1fcdf984ec7e591830'
* commit '
e1f8ec918e5e257feb0f6d1fcdf984ec7e591830':
don't add "ota-rel-keys" tag to build fingerprints
Mike Lockwood [Mon, 7 Dec 2009 16:09:53 +0000 (08:09 -0800)]
am
623a5572: resolved conflicts for merge of
882ad42e to eclair-mr2
Merge commit '
623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp
* commit '
623a5572e894c2114767f5631165354076d0b139':
Add clean step for switching GPS API from pdapi to loc_api
Mike Lockwood [Mon, 7 Dec 2009 15:52:22 +0000 (10:52 -0500)]
resolved conflicts for merge of
882ad42e to eclair-mr2
Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
Mike Lockwood [Mon, 7 Dec 2009 15:34:43 +0000 (07:34 -0800)]
am
882ad42e: Add clean step for switching GPS API from pdapi to loc_api
Merge commit '
882ad42e0de35d86f2361867e3efc497002b73e6' into eclair-plus-aosp
* commit '
882ad42e0de35d86f2361867e3efc497002b73e6':
Add clean step for switching GPS API from pdapi to loc_api
Mike Lockwood [Mon, 7 Dec 2009 12:23:25 +0000 (07:23 -0500)]
Add clean step for switching GPS API from pdapi to loc_api
Change-Id: Ifa75b0865b547f5e643a4466f13ec7485e902e5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Bjorn Bringert [Sat, 5 Dec 2009 20:38:22 +0000 (12:38 -0800)]
am
e15968b4: Clean step for the move of SearchableInfo to android.app
Merge commit '
e15968b47a30fb6411a682ac06a5d93ea89011b0' into eclair-mr2-plus-aosp
* commit '
e15968b47a30fb6411a682ac06a5d93ea89011b0':
Clean step for the move of SearchableInfo to android.app
Doug Zongker [Sat, 5 Dec 2009 20:38:19 +0000 (12:38 -0800)]
am
56a01cbb: am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
56a01cbb5cc11bedeef2f033fc31e370c7401f4a' into eclair-mr2-plus-aosp
* commit '
56a01cbb5cc11bedeef2f033fc31e370c7401f4a':
don't add "ota-rel-keys" tag to build fingerprints
Bjorn Bringert [Fri, 4 Dec 2009 12:50:46 +0000 (12:50 +0000)]
Clean step for the move of SearchableInfo to android.app
This is part of http://b/issue?id=
2270838
Change-Id: I4f70549f0a15e5c90fa5297a2af9f872bb5312a1
Doug Zongker [Fri, 4 Dec 2009 18:43:36 +0000 (10:43 -0800)]
am
95137c3d: am
6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '
95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e'
* commit '
95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e':
make build depend on event-log-tags file
Doug Zongker [Fri, 4 Dec 2009 18:41:05 +0000 (10:41 -0800)]
am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-plus-aosp
* commit '
e81271f526db01af84eabdd99d309c9425d3f1a3':
don't add "ota-rel-keys" tag to build fingerprints
Dianne Hackborn [Fri, 4 Dec 2009 18:41:00 +0000 (10:41 -0800)]
am
af5cb904: am
176c758c: Change version to MR2 development.
Merge commit '
af5cb9042497509fb75060667f5ca921c10218a6'
* commit '
af5cb9042497509fb75060667f5ca921c10218a6':
Change version to MR2 development.
Doug Zongker [Fri, 4 Dec 2009 18:40:59 +0000 (10:40 -0800)]
am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-mr2
* commit '
e81271f526db01af84eabdd99d309c9425d3f1a3':
don't add "ota-rel-keys" tag to build fingerprints
Doug Zongker [Fri, 4 Dec 2009 18:40:39 +0000 (10:40 -0800)]
am
6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '
6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp
* commit '
6c4a70c64d45545814ba60ad8ad3a95474ea0944':
make build depend on event-log-tags file
Dianne Hackborn [Fri, 4 Dec 2009 18:37:09 +0000 (10:37 -0800)]
am
176c758c: Change version to MR2 development.
Merge commit '
176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp
* commit '
176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
Change version to MR2 development.
Android (Google) Code Review [Fri, 4 Dec 2009 18:36:44 +0000 (10:36 -0800)]
Merge change Id97eba9f into eclair
* changes:
don't add "ota-rel-keys" tag to build fingerprints
Android (Google) Code Review [Fri, 4 Dec 2009 18:36:31 +0000 (10:36 -0800)]
Merge change I672b05c4 into eclair-mr2
* changes:
make build depend on event-log-tags file
Doug Zongker [Fri, 4 Dec 2009 18:05:20 +0000 (10:05 -0800)]
make build depend on event-log-tags file
Oops, I forgot to make the build actually require the event-log-tags file.
Doug Zongker [Fri, 4 Dec 2009 12:31:16 +0000 (04:31 -0800)]
am
af830d39: am
485847e4: Merge change I6f85805b into eclair-mr2
Merge commit '
af830d3999ac1670b92207f6c1201d297913b9a9'
* commit '
af830d3999ac1670b92207f6c1201d297913b9a9':
break up event-log-tags; generate java source files with constants
Doug Zongker [Fri, 4 Dec 2009 12:31:06 +0000 (04:31 -0800)]