OSDN Git Service
Doug Zongker [Sun, 27 Sep 2009 22:42:34 +0000 (15:42 -0700)]
am
a785cb55: am
2bd8abc7: Merge change 27088 into eclair
Merge commit '
a785cb55aa40c4bd251a528edb169d6e1a865169'
* commit '
a785cb55aa40c4bd251a528edb169d6e1a865169':
integrate bsdiff into imgdiff, instead of using subprocess
Scott Main [Sun, 27 Sep 2009 22:40:02 +0000 (15:40 -0700)]
Doug Zongker [Sun, 27 Sep 2009 22:36:37 +0000 (15:36 -0700)]
am
f78bee74: am
ea4a3fa3: Merge change 27066 into eclair
Merge commit '
f78bee7494653f900ecfa7a9c618b1c85ffacda6'
* commit '
f78bee7494653f900ecfa7a9c618b1c85ffacda6':
parallellize computation of binary patches
Doug Zongker [Fri, 25 Sep 2009 23:52:11 +0000 (16:52 -0700)]
am
2bd8abc7: Merge change 27088 into eclair
Merge commit '
2bd8abc7c676b28bc34294f6b0be28d98520029f' into eclair-plus-aosp
* commit '
2bd8abc7c676b28bc34294f6b0be28d98520029f':
integrate bsdiff into imgdiff, instead of using subprocess
Android (Google) Code Review [Fri, 25 Sep 2009 23:43:55 +0000 (19:43 -0400)]
Merge change 27088 into eclair
* changes:
integrate bsdiff into imgdiff, instead of using subprocess
Scott Main [Fri, 25 Sep 2009 22:10:33 +0000 (15:10 -0700)]
am
6159eead: am
afdb6feb: Merge change 27127 into donut
Merge commit '
6159eead22482c46151b9da077bf2fb8bdad1dbc' into eclair-plus-aosp
* commit '
6159eead22482c46151b9da077bf2fb8bdad1dbc':
docs only.
Scott Main [Fri, 25 Sep 2009 22:00:40 +0000 (15:00 -0700)]
Android (Google) Code Review [Fri, 25 Sep 2009 21:48:11 +0000 (17:48 -0400)]
Merge change 27127 into donut
* changes:
docs only. inherit the line height to resolve vertical scroll issue in WebKit browsers
Scott Main [Fri, 25 Sep 2009 21:15:36 +0000 (14:15 -0700)]
docs only.
inherit the line height to resolve vertical scroll
issue in WebKit browsers
Change-Id: I1707893614e3983e6b53a31229b3e19e584d6950
Doug Zongker [Fri, 25 Sep 2009 19:50:46 +0000 (12:50 -0700)]
am
ea4a3fa3: Merge change 27066 into eclair
Merge commit '
ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca' into eclair-plus-aosp
* commit '
ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca':
parallellize computation of binary patches
Android (Google) Code Review [Fri, 25 Sep 2009 19:40:43 +0000 (15:40 -0400)]
Merge change 27066 into eclair
* changes:
parallellize computation of binary patches
Doug Zongker [Fri, 25 Sep 2009 17:45:39 +0000 (10:45 -0700)]
parallellize computation of binary patches
Change ota_from_target_files to compute binary patches for all the
changed files in the OTA package in parallel. On a recent test build
this cuts incremental construction time roughly in half (6 min to 2
min 40 sec).
Doug Zongker [Fri, 25 Sep 2009 18:52:00 +0000 (11:52 -0700)]
integrate bsdiff into imgdiff, instead of using subprocess
Integrate the bsdiff code into imgdiff so we can just call it rather
than writing temp files and invoking bsdiff as a subprocess. When
computing multiple patches from the same source file, we can also save
time by doing some bsdiff preprocessing on the source file only once.
(Note this renames the existing 'bsdiff.c' -- which actually does
patching in applypatch -- to 'bspatch.c', and introduces a new
bsdiff.c linked into imgdiff.)
Scott Main [Fri, 25 Sep 2009 18:25:14 +0000 (11:25 -0700)]
am
93c80c4f: am
0c44a2a9: am
ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '
93c80c4f073811a8fab78e8b56fc2eef87aa0707'
* commit '
93c80c4f073811a8fab78e8b56fc2eef87aa0707':
adds a parameter to the URL hash on all search queries.
Scott Main [Fri, 25 Sep 2009 18:16:38 +0000 (11:16 -0700)]
am
207ce1fc: am
b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit '
207ce1fce5099ac7da18c28f63519d6103a1db32'
* commit '
207ce1fce5099ac7da18c28f63519d6103a1db32':
docs only.
Ed Heyl [Fri, 25 Sep 2009 18:15:23 +0000 (11:15 -0700)]
am
c7e20322: (-s ours) am
8392b831: Merge change 25632 into eclair
Merge commit '
c7e203226dcd537ff014d71fb0923750352838aa'
* commit '
c7e203226dcd537ff014d71fb0923750352838aa':
Set default build ID to eclair (usually this is overridden). Please do not merge.
Scott Main [Fri, 25 Sep 2009 18:10:25 +0000 (11:10 -0700)]
Joe Onorato [Fri, 25 Sep 2009 18:04:55 +0000 (11:04 -0700)]
am
4ff55ba0: am
e62902c9: Fix b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit '
4ff55ba0c7749abb0039fa49024be5f1b0e62de2'
* commit '
4ff55ba0c7749abb0039fa49024be5f1b0e62de2':
Fix http://b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Joe Onorato [Fri, 25 Sep 2009 18:04:51 +0000 (11:04 -0700)]
am
73270d49: am
f88d14c1: Cleanspec entry for the old launcher on
Merge commit '
73270d49e0716dae7d59b7e0475a53b85f970576'
* commit '
73270d49e0716dae7d59b7e0475a53b85f970576':
Cleanspec entry for the old launcher on
David 'Digit' Turner [Fri, 25 Sep 2009 17:59:31 +0000 (10:59 -0700)]
Dave Bort [Fri, 25 Sep 2009 17:51:31 +0000 (10:51 -0700)]
am
9db1fc2b: am
b392641d: Make fail if it\'s called after including
Merge commit '
9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'
* commit '
9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
Mike Lockwood [Fri, 25 Sep 2009 17:51:28 +0000 (10:51 -0700)]
am
1c418073: am
f4dc5f07: cleanspec.mk: clean GPS related binaries.
Merge commit '
1c4180738249a582a1b3f7c39f6d9f81c9c6f78d'
* commit '
1c4180738249a582a1b3f7c39f6d9f81c9c6f78d':
cleanspec.mk: clean GPS related binaries.
Scott Main [Fri, 25 Sep 2009 16:23:38 +0000 (09:23 -0700)]
am
0c44a2a9: am
ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '
0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c' into eclair-plus-aosp
* commit '
0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c':
adds a parameter to the URL hash on all search queries.
Scott Main [Fri, 25 Sep 2009 16:15:00 +0000 (09:15 -0700)]
am
ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '
ad4d4efac403eeba5d648f172aca46c3ad7962c5' into eclair
* commit '
ad4d4efac403eeba5d648f172aca46c3ad7962c5':
adds a parameter to the URL hash on all search queries.
Doug Zongker [Fri, 25 Sep 2009 15:45:37 +0000 (08:45 -0700)]
am
27495d85: am
4b7dd3e3: Merge change 26017 into eclair
Merge commit '
27495d857c505753ad834b3cfdc312902e1c3919'
* commit '
27495d857c505753ad834b3cfdc312902e1c3919':
improve the OTA progress bar
Scott Main [Fri, 25 Sep 2009 03:39:37 +0000 (20:39 -0700)]
adds a parameter to the URL hash on all search queries.
depends on change 3583, in order to handle the new parameter
Change-Id: I86ead029371615243cfd809bd7cb2a2f2830c4be
Scott Main [Fri, 25 Sep 2009 03:19:17 +0000 (20:19 -0700)]
am
b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit '
b91916b414b3c4ef3ec68bec9e84694d03a15331' into eclair-plus-aosp
* commit '
b91916b414b3c4ef3ec68bec9e84694d03a15331':
docs only.
Scott Main [Mon, 21 Sep 2009 21:50:19 +0000 (14:50 -0700)]
docs only.
change the SDK tab to point to the release notes in offline mode;
hide all other languages by default instead of
depending on the stylesheet
Ed Heyl [Fri, 25 Sep 2009 00:29:09 +0000 (17:29 -0700)]
am
8392b831: Merge change 25632 into eclair
Merge commit '
8392b83176f4090c9d7b9b4c90505bac1d280c79' into eclair-plus-aosp
* commit '
8392b83176f4090c9d7b9b4c90505bac1d280c79':
Set default build ID to eclair (usually this is overridden). Please do not merge.
Android (Google) Code Review [Fri, 25 Sep 2009 00:20:48 +0000 (20:20 -0400)]
Merge change 25632 into eclair
* changes:
Set default build ID to eclair (usually this is overridden). Please do not merge.
Scott Main [Thu, 24 Sep 2009 21:01:36 +0000 (14:01 -0700)]
am
389cdb7a: Merge change 26258 into eclair
Merge commit '
389cdb7ab60182292fe383bc1c29d7b77ca5a893' into eclair-plus-aosp
* commit '
389cdb7ab60182292fe383bc1c29d7b77ca5a893':
docs only.
Android (Google) Code Review [Thu, 24 Sep 2009 20:50:31 +0000 (16:50 -0400)]
Merge change 26258 into eclair
* changes:
docs only. remove Home tab from offline docs and make SDK tab point to new offline welcome page; hide all other languages by default instead of depending on the stylesheet
Joe Onorato [Thu, 24 Sep 2009 16:39:50 +0000 (09:39 -0700)]
am
e62902c9: Fix b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit '
e62902c95b3b6f876ffafa5595396b25e7bd2395' into eclair-plus-aosp
* commit '
e62902c95b3b6f876ffafa5595396b25e7bd2395':
Fix http://b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Joe Onorato [Thu, 24 Sep 2009 16:39:46 +0000 (09:39 -0700)]
am
f88d14c1: Cleanspec entry for the old launcher on
Merge commit '
f88d14c16ff7f3f6a35f7967c37fe88c28020b46' into eclair-plus-aosp
* commit '
f88d14c16ff7f3f6a35f7967c37fe88c28020b46':
Cleanspec entry for the old launcher on
Joe Onorato [Wed, 23 Sep 2009 22:28:12 +0000 (15:28 -0700)]
Fix b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Joe Onorato [Wed, 23 Sep 2009 15:31:24 +0000 (08:31 -0700)]
Cleanspec entry for the old launcher on
David 'Digit' Turner [Thu, 24 Sep 2009 04:41:07 +0000 (21:41 -0700)]
am
ef453a51: Fix ARMv7 -user builds
Merge commit '
ef453a51f58713bfa31c13f5e66596b3d5752049' into eclair-plus-aosp
* commit '
ef453a51f58713bfa31c13f5e66596b3d5752049':
Fix ARMv7 -user builds
David 'Digit' Turner [Thu, 24 Sep 2009 01:48:16 +0000 (18:48 -0700)]
Fix ARMv7 -user builds
Allow the dex preoptimization pass for ARMv7 system images to use the
ARMv7-specific kernel image. This is needed to fix the -user builds that
absolutely depend on running the dex preopt in the emulator.
This will hopefully be removed when we'll be able to perform the dex
preopt on the host instead.
Dave Bort [Wed, 23 Sep 2009 20:31:07 +0000 (13:31 -0700)]
am
b392641d: Make fail if it\'s called after including
Merge commit '
b392641d9b07d6321aed828c983af04115da8aab' into eclair-plus-aosp
* commit '
b392641d9b07d6321aed828c983af04115da8aab':
Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
Mike Lockwood [Wed, 23 Sep 2009 20:31:04 +0000 (13:31 -0700)]
am
f4dc5f07: cleanspec.mk: clean GPS related binaries.
Merge commit '
f4dc5f07c0c46a7439bead7379a0846ac0c122b0' into eclair-plus-aosp
* commit '
f4dc5f07c0c46a7439bead7379a0846ac0c122b0':
cleanspec.mk: clean GPS related binaries.
Dave Bort [Tue, 19 May 2009 23:12:22 +0000 (16:12 -0700)]
Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
Mike Lockwood [Wed, 23 Sep 2009 18:02:32 +0000 (14:02 -0400)]
cleanspec.mk: clean GPS related binaries.
Change-Id: I9717440f74a76b06e0128465234d588b26aa71a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Doug Zongker [Wed, 23 Sep 2009 01:18:12 +0000 (18:18 -0700)]
am
4b7dd3e3: Merge change 26017 into eclair
Merge commit '
4b7dd3e36c949729464029480ca41753c122d7f0' into eclair-plus-aosp
* commit '
4b7dd3e36c949729464029480ca41753c122d7f0':
improve the OTA progress bar
Android (Google) Code Review [Wed, 23 Sep 2009 01:11:16 +0000 (21:11 -0400)]
Merge change 26017 into eclair
* changes:
improve the OTA progress bar
Jing Yu [Mon, 21 Sep 2009 23:31:50 +0000 (16:31 -0700)]
Add FDO options to Android make system.
Scott Main [Mon, 21 Sep 2009 21:50:19 +0000 (14:50 -0700)]
docs only.
remove Home tab from offline docs and make
SDK tab point to new offline welcome page;
hide all other languages by default instead of
depending on the stylesheet
Joe Onorato [Mon, 21 Sep 2009 17:53:26 +0000 (10:53 -0700)]
am
e06a8a7d: am
c2211829: Merge change 26166 into eclair
Merge commit '
e06a8a7de358332d8bb3760e6d01e41f4d697848'
* commit '
e06a8a7de358332d8bb3760e6d01e41f4d697848':
Add a cleanspec entry for the VoiceSearch breakage that works.
Joe Onorato [Mon, 21 Sep 2009 17:42:59 +0000 (10:42 -0700)]
am
c2211829: Merge change 26166 into eclair
Merge commit '
c2211829ac225786985d77a73049413022a65b71' into eclair-plus-aosp
* commit '
c2211829ac225786985d77a73049413022a65b71':
Add a cleanspec entry for the VoiceSearch breakage that works.
Android (Google) Code Review [Mon, 21 Sep 2009 17:34:34 +0000 (13:34 -0400)]
Merge change 26166 into eclair
* changes:
Add a cleanspec entry for the VoiceSearch breakage that works.
Joe Onorato [Mon, 21 Sep 2009 17:34:04 +0000 (13:34 -0400)]
Add a cleanspec entry for the VoiceSearch breakage that works.
Hung-ying Tyan [Mon, 21 Sep 2009 17:01:08 +0000 (10:01 -0700)]
am
670ddd61: am
849dbe85: Add CertInstaller app to generic product file.
Merge commit '
670ddd61e042e4f9a9dd5b026c4197d542171966'
* commit '
670ddd61e042e4f9a9dd5b026c4197d542171966':
Add CertInstaller app to generic product file.
Hung-ying Tyan [Mon, 21 Sep 2009 16:50:57 +0000 (09:50 -0700)]
am
849dbe85: Add CertInstaller app to generic product file.
Merge commit '
849dbe85f2e1677627dda15c6c2dce790f169af2' into eclair-plus-aosp
* commit '
849dbe85f2e1677627dda15c6c2dce790f169af2':
Add CertInstaller app to generic product file.
Doug Zongker [Sun, 20 Sep 2009 21:03:55 +0000 (14:03 -0700)]
improve the OTA progress bar
Make the OTA progress bar advance a bit more smoothly by reallocating
how much is dedicated to various phases of incremental OTA
installation, based on some crude measurements of how long each phase
takes.
Hung-ying Tyan [Sun, 20 Sep 2009 19:20:47 +0000 (03:20 +0800)]
Add CertInstaller app to generic product file.
Ed Heyl [Thu, 17 Sep 2009 23:28:37 +0000 (16:28 -0700)]
Set default build ID to eclair (usually this is overridden). Please do not merge.
Debajit Ghosh [Thu, 17 Sep 2009 23:00:26 +0000 (16:00 -0700)]
am
5e36c123: am
2492327c: fix broken incremental builds due to some voicesearch change.
Merge commit '
5e36c1232d9c29f07909f82e7385a7818fdcc468'
* commit '
5e36c1232d9c29f07909f82e7385a7818fdcc468':
fix broken incremental builds due to some voicesearch change.
Debajit Ghosh [Thu, 17 Sep 2009 22:50:17 +0000 (15:50 -0700)]
am
2492327c: fix broken incremental builds due to some voicesearch change.
Merge commit '
2492327c9be4eb1f6761af963b2ca01b1af3b6a2' into eclair-plus-aosp
* commit '
2492327c9be4eb1f6761af963b2ca01b1af3b6a2':
fix broken incremental builds due to some voicesearch change.
Debajit Ghosh [Thu, 17 Sep 2009 22:30:00 +0000 (15:30 -0700)]
fix broken incremental builds due to some voicesearch change.
Scott Main [Thu, 17 Sep 2009 19:45:36 +0000 (12:45 -0700)]
am
b66f9b3e: am
9958256b: am
1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '
b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e'
* commit '
b66f9b3e367c4f15eeab7a54cd8d5331f3787b1e':
docs only.
Scott Main [Thu, 17 Sep 2009 19:36:03 +0000 (12:36 -0700)]
am
9958256b: am
1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '
9958256b202e5ad5554bf91d4d77655662b31d5b' into eclair-plus-aosp
* commit '
9958256b202e5ad5554bf91d4d77655662b31d5b':
docs only.
Scott Main [Thu, 17 Sep 2009 19:29:05 +0000 (12:29 -0700)]
am
1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '
1da823869ccbc5f848cdd35d52d1630886288446' into eclair
* commit '
1da823869ccbc5f848cdd35d52d1630886288446':
docs only.
Ben Murdoch [Thu, 17 Sep 2009 18:58:11 +0000 (19:58 +0100)]
resolved conflicts for merge of
72f6e5ac to master
Scott Main [Thu, 17 Sep 2009 17:54:05 +0000 (10:54 -0700)]
docs only.
use normal DOM mod instead of jquery to load the lists.js
file because jquery was appending GET parameters that
eliminated any caching of the file.
Change-Id: I926ef8c164ba81d040256accaf78883807c3b57e
Dirk Dougherty [Thu, 17 Sep 2009 16:57:12 +0000 (09:57 -0700)]
am
f2ffc366: am
60bbe187: am
c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '
f2ffc36648c5660846f8e8c173644e0b6b4e0288'
* commit '
f2ffc36648c5660846f8e8c173644e0b6b4e0288':
Change sdk doc template so that ADT download link bypasses clickthrough.
Ben Murdoch [Thu, 17 Sep 2009 15:48:38 +0000 (08:48 -0700)]
am
1f030dcb: Update the cleanspec to clean libwebcore.
Merge commit '
1f030dcba62978a8d81a84a5f26c36a2bbf79557' into eclair-plus-aosp
* commit '
1f030dcba62978a8d81a84a5f26c36a2bbf79557':
Update the cleanspec to clean libwebcore.
Xavier Ducrohet [Thu, 17 Sep 2009 13:38:50 +0000 (06:38 -0700)]
am
8627291e: am
502cf95a: am
743c1937: Merge change 24941 into donut
Merge commit '
8627291e99397d9f453e15434a7d1160ece1878b'
* commit '
8627291e99397d9f453e15434a7d1160ece1878b':
Add TTS files and Accessibility app to the SDK system image.
Mike Ritter [Thu, 17 Sep 2009 13:38:46 +0000 (06:38 -0700)]
am
31d00206: am
e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '
31d002062e3735767401a26728e8bd5807095532'
* commit '
31d002062e3735767401a26728e8bd5807095532':
Bug in Mac build where it gets confused over case, fix no longer needed.
Doug Zongker [Thu, 17 Sep 2009 13:38:43 +0000 (06:38 -0700)]
am
f1436ccd: am
353448c7: Merge change 24973 into eclair
Merge commit '
f1436ccdea1d63cb2a7345340929efcc4de8b7e9'
* commit '
f1436ccdea1d63cb2a7345340929efcc4de8b7e9':
increase reserved blocks from 5 to 8
Doug Zongker [Thu, 17 Sep 2009 13:38:40 +0000 (06:38 -0700)]
am
fe0602f6: increase reserved blocks from 5 to 8
Merge commit '
fe0602f60b971c3b350d47115cba188cc67c7038'
* commit '
fe0602f60b971c3b350d47115cba188cc67c7038':
increase reserved blocks from 5 to 8
Ben Murdoch [Thu, 17 Sep 2009 10:29:36 +0000 (11:29 +0100)]
Update the cleanspec to clean libwebcore.
Change-Id: Ie27e0e1c8a617199f1d8ff0b484936ccd14b04de
Dirk Dougherty [Wed, 16 Sep 2009 18:30:41 +0000 (11:30 -0700)]
am
60bbe187: am
c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '
60bbe187da1e0b5aa753c3611e81cbb61f886599' into eclair-plus-aosp
* commit '
60bbe187da1e0b5aa753c3611e81cbb61f886599':
Change sdk doc template so that ADT download link bypasses clickthrough.
Dirk Dougherty [Wed, 16 Sep 2009 18:23:08 +0000 (11:23 -0700)]
am
c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '
c66c90a803ef256b5f945d10bd0ddd5abae15d64' into eclair
* commit '
c66c90a803ef256b5f945d10bd0ddd5abae15d64':
Change sdk doc template so that ADT download link bypasses clickthrough.
Dirk Dougherty [Wed, 16 Sep 2009 17:11:01 +0000 (10:11 -0700)]
Change sdk doc template so that ADT download link bypasses clickthrough.
Change-Id: Ibea052b718f17043c992af7d5334b1c7e4fe2c6b
Xavier Ducrohet [Tue, 15 Sep 2009 20:47:17 +0000 (13:47 -0700)]
am
502cf95a: am
743c1937: Merge change 24941 into donut
Merge commit '
502cf95ad4cfa1ae9506bf5ad9c938532a5bb57e' into eclair-plus-aosp
* commit '
502cf95ad4cfa1ae9506bf5ad9c938532a5bb57e':
Add TTS files and Accessibility app to the SDK system image.
Mike Ritter [Tue, 15 Sep 2009 20:45:42 +0000 (13:45 -0700)]
am
e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '
e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp
* commit '
e44fadeb49aac9d762f089ee2f23e4a4907a822f':
Bug in Mac build where it gets confused over case, fix no longer needed.
Doug Zongker [Tue, 15 Sep 2009 20:45:39 +0000 (13:45 -0700)]
am
353448c7: Merge change 24973 into eclair
Merge commit '
353448c7b06847ac19a712439cebaee163a3e079' into eclair-plus-aosp
* commit '
353448c7b06847ac19a712439cebaee163a3e079':
increase reserved blocks from 5 to 8
Xavier Ducrohet [Tue, 15 Sep 2009 20:18:52 +0000 (13:18 -0700)]
am
743c1937: Merge change 24941 into donut
Merge commit '
743c19373a1c78bf2cc4d1c0dfd905e27ff598c6' into eclair
* commit '
743c19373a1c78bf2cc4d1c0dfd905e27ff598c6':
Add TTS files and Accessibility app to the SDK system image.
Xavier Ducrohet [Tue, 15 Sep 2009 20:16:12 +0000 (13:16 -0700)]
am
2f7cfd2a: am
be49598e: Merge change 24712 into eclair
Merge commit '
2f7cfd2a52d7ea17f08874f84eb2240854978e97'
* commit '
2f7cfd2a52d7ea17f08874f84eb2240854978e97':
Fix CS templates to handle non-included classes.
Scott Main [Tue, 15 Sep 2009 20:14:16 +0000 (13:14 -0700)]
am
40a65ab4: am
5175caf6: am
ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '
40a65ab4e6b71ad266bb29eb129283d6d709b7e9'
* commit '
40a65ab4e6b71ad266bb29eb129283d6d709b7e9':
docs only.
Mike Ritter [Tue, 15 Sep 2009 18:18:31 +0000 (11:18 -0700)]
Bug in Mac build where it gets confused over case, fix no longer needed.
Doug Zongker [Tue, 15 Sep 2009 00:46:41 +0000 (17:46 -0700)]
increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
Android (Google) Code Review [Tue, 15 Sep 2009 00:54:13 +0000 (20:54 -0400)]
Merge change 24973 into eclair
* changes:
increase reserved blocks from 5 to 8
Doug Zongker [Tue, 15 Sep 2009 00:46:41 +0000 (17:46 -0700)]
increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
Android (Google) Code Review [Mon, 14 Sep 2009 22:41:50 +0000 (18:41 -0400)]
Merge change 24941 into donut
* changes:
Add TTS files and Accessibility app to the SDK system image.
Xavier Ducrohet [Mon, 14 Sep 2009 22:00:27 +0000 (15:00 -0700)]
Add TTS files and Accessibility app to the SDK system image.
Xavier Ducrohet [Fri, 11 Sep 2009 19:06:49 +0000 (12:06 -0700)]
am
be49598e: Merge change 24712 into eclair
Merge commit '
be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp
* commit '
be49598e2d7609e50eadd0dcba2190c01265c0a9':
Fix CS templates to handle non-included classes.
Android (Google) Code Review [Fri, 11 Sep 2009 18:58:54 +0000 (14:58 -0400)]
Merge change 24712 into eclair
* changes:
Fix CS templates to handle non-included classes.
Xavier Ducrohet [Fri, 11 Sep 2009 17:59:31 +0000 (10:59 -0700)]
Fix CS templates to handle non-included classes.
This fix is to handle generate documentation not including base clases
(like java.* or android.*). Links to missing base classes must not be
created or they would point nowhere.
Change-Id: Ic591916fe9b6802903d894bd2cd3c45690533912
Scott Main [Fri, 11 Sep 2009 17:58:58 +0000 (10:58 -0700)]
am
5175caf6: am
ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '
5175caf6eaab1b22c4cc1f352f22cd69d291a68e' into eclair-plus-aosp
* commit '
5175caf6eaab1b22c4cc1f352f22cd69d291a68e':
docs only.
Scott Main [Fri, 11 Sep 2009 17:49:26 +0000 (10:49 -0700)]
am
ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '
ded57160b406d5b253206cf5884ab9b33ac23b3c' into eclair
* commit '
ded57160b406d5b253206cf5884ab9b33ac23b3c':
docs only.
Scott Main [Fri, 11 Sep 2009 17:17:37 +0000 (10:17 -0700)]
docs only.
new donut image for compatibility with IE6 transparency issues
Change-Id: I444b09d7c5b211b3a07e7221ad96b3a7e4d989f7
Xavier Ducrohet [Thu, 10 Sep 2009 22:19:55 +0000 (15:19 -0700)]
am
030df428: am
85762123: Merge change 24584 into eclair
Merge commit '
030df428443735eed084286564407198792daa82'
* commit '
030df428443735eed084286564407198792daa82':
Add support for @pending annotation.
Xavier Ducrohet [Thu, 10 Sep 2009 22:19:51 +0000 (15:19 -0700)]
am
aca5e20e: am
a3c35d19: Merge change 24565 into eclair
Merge commit '
aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea'
* commit '
aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea':
Add missing @Override to DroidDoc and ApiCheck
Xavier Ducrohet [Thu, 10 Sep 2009 22:10:39 +0000 (15:10 -0700)]
am
85762123: Merge change 24584 into eclair
Merge commit '
857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp
* commit '
857621233a13b28a31cbd6e0ae4e2df4eed44d83':
Add support for @pending annotation.
Xavier Ducrohet [Thu, 10 Sep 2009 22:10:36 +0000 (15:10 -0700)]
am
a3c35d19: Merge change 24565 into eclair
Merge commit '
a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp
* commit '
a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
Add missing @Override to DroidDoc and ApiCheck
Android (Google) Code Review [Thu, 10 Sep 2009 22:03:47 +0000 (18:03 -0400)]
Merge change 24584 into eclair
* changes:
Add support for @pending annotation.
Android (Google) Code Review [Thu, 10 Sep 2009 22:03:32 +0000 (18:03 -0400)]
Merge change 24565 into eclair
* changes:
Add missing @Override to DroidDoc and ApiCheck
Xavier Ducrohet [Thu, 10 Sep 2009 21:50:12 +0000 (14:50 -0700)]
Add support for @pending annotation.
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.
Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
Xavier Ducrohet [Thu, 10 Sep 2009 20:08:27 +0000 (13:08 -0700)]
Add missing @Override to DroidDoc and ApiCheck
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
Andy McFadden [Thu, 10 Sep 2009 17:55:03 +0000 (10:55 -0700)]
am
42fe578d: am
2c86bfd2: Sleazy workaround for webkit build failures.
Merge commit '
42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'
* commit '
42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
Sleazy workaround for webkit build failures.