OSDN Git Service
Dan Egnor [Thu, 29 Oct 2009 00:22:05 +0000 (17:22 -0700)]
am
a6b495ce: Clean frameworks after replacing IDropBox.aidl with IDropBoxService.aidl, which causes some build confusion with dependencies and Parcelables and so on.
Merge commit '
a6b495ce40f640f581e27ebd8d935d706daa9f2d' into eclair-mr2-plus-aosp
* commit '
a6b495ce40f640f581e27ebd8d935d706daa9f2d':
Clean frameworks after replacing IDropBox.aidl with
android-build SharedAccount [Thu, 29 Oct 2009 00:21:53 +0000 (17:21 -0700)]
am
8a5d5272: resolved conflicts for merge of
3fa11599 to eclair-mr2
Merge commit '
8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp
* commit '
8a5d527223414c3c23b8021eb8ed468d3299e968':
Bump version to 2.1 API 6.
Dan Egnor [Wed, 28 Oct 2009 01:46:27 +0000 (18:46 -0700)]
Clean frameworks after replacing IDropBox.aidl with
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.
(Will be checked in immediately after the change in question)
android-build SharedAccount [Wed, 28 Oct 2009 23:12:11 +0000 (16:12 -0700)]
resolved conflicts for merge of
3fa11599 to eclair-mr2
Jean-Baptiste Queru [Wed, 28 Oct 2009 21:57:01 +0000 (14:57 -0700)]
merge from open-source master
Scott Main [Wed, 28 Oct 2009 17:42:13 +0000 (10:42 -0700)]
am
eae4fc96: am
836a695f: am
f1bac52f: fix search for offline docs. again.
Merge commit '
eae4fc960cec88f50eea7ae65f85f5722b0ad26b' into eclair-mr2-plus-aosp
* commit '
eae4fc960cec88f50eea7ae65f85f5722b0ad26b':
fix search for offline docs. again.
Dirk Dougherty [Wed, 28 Oct 2009 17:42:08 +0000 (10:42 -0700)]
am
12313686: am
ee3a3c1f: am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp
* commit '
12313686fb731e79224067ed13749c2c4dae4256':
doc change: include SDK Tools in notice to 1.6 developers.
Scott Main [Wed, 28 Oct 2009 17:30:34 +0000 (10:30 -0700)]
am
836a695f: am
f1bac52f: fix search for offline docs. again.
Merge commit '
836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2
* commit '
836a695f01799566969c12d5c83459bdb5d8b2c2':
fix search for offline docs. again.
Dirk Dougherty [Wed, 28 Oct 2009 17:26:52 +0000 (10:26 -0700)]
am
ee3a3c1f: am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2
* commit '
ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
Dianne Hackborn [Fri, 23 Oct 2009 19:17:45 +0000 (12:17 -0700)]
Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
Scott Main [Mon, 26 Oct 2009 22:41:42 +0000 (15:41 -0700)]
am
f1bac52f: fix search for offline docs. again.
Merge commit '
f1bac52fe28ba503c63c929d9d0711671273635f' into eclair
* commit '
f1bac52fe28ba503c63c929d9d0711671273635f':
fix search for offline docs. again.
Scott Main [Mon, 26 Oct 2009 21:44:48 +0000 (14:44 -0700)]
fix search for offline docs. again.
Dirk Dougherty [Mon, 26 Oct 2009 18:18:47 +0000 (11:18 -0700)]
am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair
* commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
doc change: include SDK Tools in notice to 1.6 developers.
Dirk Dougherty [Sat, 24 Oct 2009 21:38:58 +0000 (14:38 -0700)]
doc change: include SDK Tools in notice to 1.6 developers.
Bug:
2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
Scott Main [Sat, 24 Oct 2009 04:23:04 +0000 (21:23 -0700)]
am
214ea8f1: am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
214ea8f14ee2b62b80905ad038110066f95be84b' into eclair-mr2-plus-aosp
* commit '
214ea8f14ee2b62b80905ad038110066f95be84b':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:13:32 +0000 (21:13 -0700)]
am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-mr2
* commit '
3af366ddb2634f97f440b1437bbd21d00101c93b':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:04:02 +0000 (21:04 -0700)]
am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef' into eclair
* commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 00:19:06 +0000 (17:19 -0700)]
am
11cb880f: am
e0ac5c3e: am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp
* commit '
11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
docs: change javascript so that SDK docs that are not
Scott Main [Sat, 24 Oct 2009 00:08:14 +0000 (17:08 -0700)]
am
e0ac5c3e: am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9' into eclair-mr2
* commit '
e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
Scott Main [Sat, 24 Oct 2009 00:00:25 +0000 (17:00 -0700)]
am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
0d8872e6f2462a947c1543b88a7a353072b808e3' into eclair
* commit '
0d8872e6f2462a947c1543b88a7a353072b808e3':
docs: change javascript so that SDK docs that are not
Scott Main [Fri, 23 Oct 2009 23:19:37 +0000 (16:19 -0700)]
docs: implement sdk announcement in a collapsible box
and revise the 'special' box color and add rounded corners.
Scott Main [Fri, 23 Oct 2009 20:21:18 +0000 (13:21 -0700)]
am
7a0ec6b5: am
f963ee63: am
60dba894: docs: add eclair logo for homepage
Merge commit '
7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db' into eclair-mr2-plus-aosp
* commit '
7a0ec6b566dc74058a9c4e4aed44bc0cc317d3db':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 20:10:12 +0000 (13:10 -0700)]
am
f963ee63: am
60dba894: docs: add eclair logo for homepage
Merge commit '
f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit '
f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 20:04:31 +0000 (13:04 -0700)]
docs: change javascript so that SDK docs that are not
listed in the left nav do not highlight parent index documents
Scott Main [Fri, 23 Oct 2009 20:02:29 +0000 (13:02 -0700)]
am
60dba894: docs: add eclair logo for homepage
Merge commit '
60dba89451e4ee489720436a9a3f3de4823da7d2' into eclair
* commit '
60dba89451e4ee489720436a9a3f3de4823da7d2':
docs: add eclair logo for homepage
Scott Main [Fri, 23 Oct 2009 19:22:42 +0000 (12:22 -0700)]
docs: add eclair logo for homepage
Doug Zongker [Thu, 22 Oct 2009 23:46:31 +0000 (16:46 -0700)]
am
5f5f08dd: stop adding ota-rel-keys tag when signing
Merge commit '
5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb' into eclair-mr2-plus-aosp
* commit '
5f5f08dd226a153ff4c73c0b1918bd5cc1afcffb':
stop adding ota-rel-keys tag when signing
Doug Zongker [Thu, 22 Oct 2009 23:09:34 +0000 (16:09 -0700)]
stop adding ota-rel-keys tag when signing
ota-rel-keys is now redundant with release-keys, since there are no
"half-signed" builds any more.
Brett Chabot [Thu, 22 Oct 2009 21:22:43 +0000 (14:22 -0700)]
am
7627a373: am
5449e457: Merge change I3fb149d2 into eclair
Merge commit '
7627a373f393e379a7fb80da8ea84081692db823' into eclair-mr2-plus-aosp
* commit '
7627a373f393e379a7fb80da8ea84081692db823':
Remove 'cd top' step from envsetup runtest shortcut.
Brett Chabot [Thu, 22 Oct 2009 21:12:09 +0000 (14:12 -0700)]
am
5449e457: Merge change I3fb149d2 into eclair
Merge commit '
5449e457534a619f7b2aaa008024095023b801ba' into eclair-mr2
* commit '
5449e457534a619f7b2aaa008024095023b801ba':
Remove 'cd top' step from envsetup runtest shortcut.
Android (Google) Code Review [Thu, 22 Oct 2009 21:04:56 +0000 (17:04 -0400)]
Merge change I3fb149d2 into eclair
* changes:
Remove 'cd top' step from envsetup runtest shortcut.
Dirk Dougherty [Thu, 22 Oct 2009 18:41:38 +0000 (11:41 -0700)]
am
31150b29: am
f03f574a: am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
31150b290e980254b0a92f753add0749b9c4b1ca' into eclair-mr2-plus-aosp
* commit '
31150b290e980254b0a92f753add0749b9c4b1ca':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:41:34 +0000 (11:41 -0700)]
am
3b5065ff: am
51da2c57: am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
3b5065ff869b85750eb191112235d46a48c05a49' into eclair-mr2-plus-aosp
* commit '
3b5065ff869b85750eb191112235d46a48c05a49':
doc change: template/asset changes for sdk package.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:55 +0000 (11:31 -0700)]
am
f03f574a: am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-mr2
* commit '
f03f574a021e412b2060116c1112b62b4c21c2fe':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:51 +0000 (11:31 -0700)]
am
51da2c57: am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-mr2
* commit '
51da2c573d945d17890e519e7e26a89b2d2f7b51':
doc change: template/asset changes for sdk package.
Dirk Dougherty [Thu, 22 Oct 2009 18:22:00 +0000 (11:22 -0700)]
am
3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit '
3d3d7b7efd755d13c7e70f01b1ba00ba0742a354' into eclair
* commit '
3d3d7b7efd755d13c7e70f01b1ba00ba0742a354':
doc change: template changes for new SDK doc structure.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:51 +0000 (11:21 -0700)]
am
fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '
fce6b45f629e59b79beed1c18486530c00769bbf' into eclair
* commit '
fce6b45f629e59b79beed1c18486530c00769bbf':
doc change: template/asset changes for sdk package.
Owen Lin [Thu, 22 Oct 2009 16:33:33 +0000 (09:33 -0700)]
am
355670b9: am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp
* commit '
355670b98584210502f96fe0446a854f07026c28':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 16:33:29 +0000 (09:33 -0700)]
am
c6c46243: am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp
* commit '
c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Owen Lin [Thu, 22 Oct 2009 13:44:28 +0000 (06:44 -0700)]
am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2
* commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 13:43:04 +0000 (06:43 -0700)]
am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2
* commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Doug Zongker [Thu, 22 Oct 2009 05:31:04 +0000 (22:31 -0700)]
am
b04f8cdc: am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp
* commit '
b04f8cdccf01132c7c14df1fed1f39c9dbb752c6':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Doug Zongker [Thu, 22 Oct 2009 05:22:32 +0000 (22:22 -0700)]
am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2
* commit '
decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Brett Chabot [Thu, 22 Oct 2009 03:05:26 +0000 (20:05 -0700)]
Remove 'cd top' step from envsetup runtest shortcut.
Instead, execute runtest as an absolute path. Ths is necessary to support
relative path based arguments in runtest. Bug
2133198
Dirk Dougherty [Thu, 22 Oct 2009 02:52:52 +0000 (19:52 -0700)]
doc change: template changes for new SDK doc structure.
Bug:
2160782
Owen Lin [Fri, 16 Oct 2009 09:43:05 +0000 (02:43 -0700)]
Add OVERRIDE_PACKAGES support for prebuild modules.
So that some prebuild module can override existing packages.
Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
Android (Google) Code Review [Wed, 21 Oct 2009 02:28:45 +0000 (22:28 -0400)]
Merge change Ied29246e into eclair
* changes:
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Brandon Ballinger [Wed, 21 Oct 2009 00:41:16 +0000 (17:41 -0700)]
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Android (Google) Code Review [Tue, 20 Oct 2009 20:28:14 +0000 (16:28 -0400)]
Merge change I5e98e6f0 into eclair
* changes:
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Owen Lin [Tue, 20 Oct 2009 17:08:00 +0000 (10:08 -0700)]
am
daf234d3: am
0a7b54de: Add package Gallery into default build.
Merge commit '
daf234d374840d96282b34393309487a21ab45c4' into eclair-mr2-plus-aosp
* commit '
daf234d374840d96282b34393309487a21ab45c4':
Add package Gallery into default build.
Owen Lin [Tue, 20 Oct 2009 16:57:53 +0000 (09:57 -0700)]
am
0a7b54de: Add package Gallery into default build.
Merge commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-mr2
* commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
Add package Gallery into default build.
Owen Lin [Thu, 15 Oct 2009 09:09:18 +0000 (02:09 -0700)]
Add package Gallery into default build.
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
Steve Block [Tue, 20 Oct 2009 09:34:59 +0000 (02:34 -0700)]
am
9234663c: WebKit clean required by merge with new WebKit version.
Merge commit '
9234663c558239cc7f97f5daf287f12a177e7dba' into eclair-mr2-plus-aosp
* commit '
9234663c558239cc7f97f5daf287f12a177e7dba':
WebKit clean required by merge with new WebKit version.
Doug Zongker [Tue, 20 Oct 2009 00:05:46 +0000 (17:05 -0700)]
use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Steve Block [Mon, 19 Oct 2009 17:41:07 +0000 (18:41 +0100)]
WebKit clean required by merge with new WebKit version.
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
Dirk Dougherty [Sat, 17 Oct 2009 00:14:33 +0000 (17:14 -0700)]
doc change: template/asset changes for sdk package.
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:08 +0000 (16:02 -0700)]
merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 15:18:24 +0000 (08:18 -0700)]
merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 01:04:35 +0000 (18:04 -0700)]
Merge from donut
Android (Google) Code Review [Tue, 13 Oct 2009 21:12:59 +0000 (17:12 -0400)]
Merge change I04432db5 into eclair-mr2
* changes:
use aapt to build jar files instead of the system zip
Raphael [Tue, 13 Oct 2009 19:18:21 +0000 (12:18 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Tue, 13 Oct 2009 19:17:40 +0000 (12:17 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Mon, 12 Oct 2009 23:16:02 +0000 (16:16 -0700)]
Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
Doug Zongker [Fri, 9 Oct 2009 19:11:30 +0000 (12:11 -0700)]
use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
Jean-Baptiste Queru [Fri, 9 Oct 2009 17:24:23 +0000 (10:24 -0700)]
reconcile tools-docs into main branch
Dianne Hackborn [Fri, 9 Oct 2009 04:07:12 +0000 (21:07 -0700)]
am
ff6f3fe4: Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Merge commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2
* commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Dianne Hackborn [Fri, 9 Oct 2009 04:06:51 +0000 (21:06 -0700)]
am
ff6f3fe4: Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Merge commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp
* commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Dianne Hackborn [Fri, 9 Oct 2009 03:50:27 +0000 (20:50 -0700)]
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
We are now 2.0. Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.
Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
Brett Chabot [Thu, 8 Oct 2009 21:42:58 +0000 (14:42 -0700)]
Merge commit '
1b3886b8' into manualmerge
Brett Chabot [Thu, 8 Oct 2009 20:47:07 +0000 (13:47 -0700)]
Merge commit '
af6ccb69' into manualmerge
Brett Chabot [Thu, 8 Oct 2009 18:19:00 +0000 (11:19 -0700)]
am
1b3886b8: am
45dc54f6: Add speech tests to CTS makefile.
Merge commit '
1b3886b8485589438a86ccb5b9dbb9067da35627' into eclair-plus-aosp
* commit '
1b3886b8485589438a86ccb5b9dbb9067da35627':
Add speech tests to CTS makefile.
Brett Chabot [Thu, 8 Oct 2009 18:18:57 +0000 (11:18 -0700)]
am
af6ccb69: am
30e1f2bd: Add dpi tests to CTS.
Merge commit '
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4' into eclair-plus-aosp
* commit '
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4':
Add dpi tests to CTS.
Brett Chabot [Thu, 8 Oct 2009 17:48:24 +0000 (10:48 -0700)]
am
45dc54f6: Add speech tests to CTS makefile.
Merge commit '
45dc54f680faea12519870db356f84924c00687d' into eclair
* commit '
45dc54f680faea12519870db356f84924c00687d':
Add speech tests to CTS makefile.
Brett Chabot [Thu, 8 Oct 2009 17:48:20 +0000 (10:48 -0700)]
am
30e1f2bd: Add dpi tests to CTS.
Merge commit '
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair
* commit '
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
Add dpi tests to CTS.
Brett Chabot [Thu, 17 Sep 2009 01:56:23 +0000 (18:56 -0700)]
Add speech tests to CTS makefile.
Brett Chabot [Thu, 10 Sep 2009 20:35:54 +0000 (13:35 -0700)]
Add dpi tests to CTS.
Android (Google) Code Review [Thu, 8 Oct 2009 01:09:17 +0000 (21:09 -0400)]
Merge change I5bbd2294 into eclair-mr2
* changes:
For Ying Wang:
Doug Zongker [Thu, 8 Oct 2009 00:19:28 +0000 (17:19 -0700)]
am
f2b32f2a: resolved conflicts for merge of
cfd7db6d to eclair
Merge commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2
* commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Doug Zongker [Thu, 8 Oct 2009 00:17:45 +0000 (17:17 -0700)]
am
f2b32f2a: resolved conflicts for merge of
cfd7db6d to eclair
Merge commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp
* commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Doug Zongker [Thu, 8 Oct 2009 00:05:36 +0000 (17:05 -0700)]
resolved conflicts for merge of
cfd7db6d to eclair
Sriram Raman [Wed, 7 Oct 2009 23:27:38 +0000 (16:27 -0700)]
For Ying Wang:
Fix "argument list too long" build error bug.
Doug Zongker [Wed, 7 Oct 2009 18:35:53 +0000 (11:35 -0700)]
move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
Jeff Hamilton [Wed, 7 Oct 2009 19:02:43 +0000 (12:02 -0700)]
am
979d5567: Merge change I6b350185 into eclair
Merge commit '
979d5567b72b4f3a8219b4786f9f512601645121' into eclair-plus-aosp
* commit '
979d5567b72b4f3a8219b4786f9f512601645121':
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 19:02:18 +0000 (12:02 -0700)]
am
0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '
0889661cd890e49a4827da0dc5d583274347d178' into eclair-plus-aosp
* commit '
0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Dianne Hackborn [Wed, 7 Oct 2009 18:59:56 +0000 (11:59 -0700)]
am
0187d842: Part of issue #
2168428: STOP SHIP: Bump API version to 5
Merge commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-plus-aosp
* commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #
2168428: STOP SHIP: Bump API version to 5
Mike Ritter [Wed, 7 Oct 2009 18:54:56 +0000 (11:54 -0700)]
am
c51aa3bd: am
69625548: Merge change I239e9f26 into donut
Merge commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-plus-aosp
* commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
Bug in Mac build where it gets confused over case, fix no longer needed.
Marco Nelissen [Wed, 7 Oct 2009 18:54:04 +0000 (11:54 -0700)]
am
f885d876: Merge change I2bdc7ec9 into eclair
Merge commit '
f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp
* commit '
f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
Speed up warn.py about 30x by precompiling all the regular expressions.
Joe Onorato [Wed, 7 Oct 2009 18:54:00 +0000 (11:54 -0700)]
am
ea79e65f: Merge change Ib7704386 into eclair
Merge commit '
ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-plus-aosp
* commit '
ea79e65fc656351ffeae1daa2cc40abba05d56b9':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
Scott Main [Wed, 7 Oct 2009 18:53:41 +0000 (11:53 -0700)]
am
5f0241f5: am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-plus-aosp
* commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639':
docs only.
Jeff Hamilton [Wed, 7 Oct 2009 18:38:17 +0000 (11:38 -0700)]
am
979d5567: Merge change I6b350185 into eclair
Merge commit '
979d5567b72b4f3a8219b4786f9f512601645121' into eclair-mr2
* commit '
979d5567b72b4f3a8219b4786f9f512601645121':
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 18:37:52 +0000 (11:37 -0700)]
am
0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '
0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2
* commit '
0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Android (Google) Code Review [Wed, 7 Oct 2009 18:05:28 +0000 (14:05 -0400)]
Merge change I6b350185 into eclair
* changes:
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 17:01:13 +0000 (10:01 -0700)]
eng builds only -- make the thing that makes setupwizard optional actually work.
Jeff Hamilton [Wed, 7 Oct 2009 05:30:19 +0000 (00:30 -0500)]
Add a cleanspec rule for the change to bump the API version to 5.
Change-Id: I6b35018552b3a9fc2016f054c8a3c2feb41bc0ad
Dianne Hackborn [Wed, 7 Oct 2009 02:22:41 +0000 (19:22 -0700)]
am
0187d842: Part of issue #
2168428: STOP SHIP: Bump API version to 5
Merge commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2
* commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #
2168428: STOP SHIP: Bump API version to 5
Dianne Hackborn [Wed, 7 Oct 2009 00:22:49 +0000 (17:22 -0700)]
Part of issue #
2168428: STOP SHIP: Bump API version to 5
This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.
Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
Mike Ritter [Tue, 6 Oct 2009 18:57:51 +0000 (11:57 -0700)]
am
c51aa3bd: am
69625548: Merge change I239e9f26 into donut
Merge commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-mr2
* commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
Bug in Mac build where it gets confused over case, fix no longer needed.
Mike Ritter [Tue, 6 Oct 2009 18:46:36 +0000 (11:46 -0700)]
am
69625548: Merge change I239e9f26 into donut
Merge commit '
69625548bf020685cdcb57dffe8f34aba80f11e5' into eclair
* commit '
69625548bf020685cdcb57dffe8f34aba80f11e5':
Bug in Mac build where it gets confused over case, fix no longer needed.
Android (Google) Code Review [Tue, 6 Oct 2009 18:36:51 +0000 (14:36 -0400)]
Merge change I239e9f26 into donut
* changes:
Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Android (Google) Code Review [Tue, 6 Oct 2009 18:09:28 +0000 (14:09 -0400)]
Merge change I7bc67c51 into eclair-mr2
* changes:
Manual merge of donut-gms cts.mk changes.