Doug Zongker
f1436ccdea
am 353448c7: Merge change 24973 into eclair
...
Merge commit '353448c7b06847ac19a712439cebaee163a3e079' into eclair-plus-aosp
* commit '353448c7b06847ac19a712439cebaee163a3e079':
increase reserved blocks from 5 to 8
2009-09-15 13:45:39 -07:00
Xavier Ducrohet
502cf95ad4
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.
2009-09-15 13:18:52 -07:00
Xavier Ducrohet
c10001ea56
am 2f7cfd2a: am be49598e: Merge change 24712 into eclair
...
Merge commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97'
* commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97':
Fix CS templates to handle non-included classes.
2009-09-15 13:16:12 -07:00
Scott Main
352e8d79b9
am 40a65ab4: am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
...
Merge commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9'
* commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9':
docs only.
2009-09-15 13:14:16 -07:00
Mike Ritter
e44fadeb49
Bug in Mac build where it gets confused over case, fix no longer needed.
2009-09-15 11:18:31 -07:00
The Android Open Source Project
e7985e7695
ERC77
2009-09-15 08:36:07 -07:00
The Android Open Source Project
ca98de90a4
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-15 08:35:55 -07:00
Doug Zongker
fe0602f60b
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.
2009-09-14 18:08:45 -07:00
Android (Google) Code Review
353448c7b0
Merge change 24973 into eclair
...
* changes:
increase reserved blocks from 5 to 8
2009-09-14 20:54:13 -04:00
Doug Zongker
93d9ff44ce
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.
2009-09-14 17:46:41 -07:00
The Android Open Source Project
61ec67945b
ERC76B
2009-09-14 17:39:21 -07:00
Android (Google) Code Review
743c19373a
Merge change 24941 into donut
...
* changes:
Add TTS files and Accessibility app to the SDK system image.
2009-09-14 18:41:50 -04:00
Xavier Ducrohet
1b6b32c277
Add TTS files and Accessibility app to the SDK system image.
2009-09-14 15:38:53 -07:00
android-build SharedAccount
30b0e7cb66
ERC76
2009-09-14 09:03:43 -07:00
android-build SharedAccount
59767c79e8
Merge commit 'goog/eclair' into eclair-release
2009-09-14 08:50:03 -07:00
android-build SharedAccount
c9852144e4
ERC73B
2009-09-11 14:14:29 -07:00
Xavier Ducrohet
2f7cfd2a52
am be49598e: Merge change 24712 into eclair
...
Merge commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp
* commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9':
Fix CS templates to handle non-included classes.
2009-09-11 12:06:49 -07:00
Android (Google) Code Review
be49598e2d
Merge change 24712 into eclair
...
* changes:
Fix CS templates to handle non-included classes.
2009-09-11 14:58:54 -04:00
Xavier Ducrohet
63ec8e3b58
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
2009-09-11 11:14:00 -07:00
Scott Main
40a65ab4e6
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.
2009-09-11 10:58:58 -07:00
Scott Main
5175caf6ea
am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
...
Merge commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c' into eclair
* commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c':
docs only.
2009-09-11 10:49:26 -07:00
Scott Main
ded57160b4
docs only.
...
new donut image for compatibility with IE6 transparency issues
Change-Id: I444b09d7c5b211b3a07e7221ad96b3a7e4d989f7
2009-09-11 10:31:36 -07:00
android-build SharedAccount
e6da146c3a
ERC73
2009-09-11 08:44:45 -07:00
android-build SharedAccount
9544d08bf4
ERC72B
2009-09-10 16:54:48 -07:00
android-build SharedAccount
6b44e3d73e
Merge branch 'eclair' into eclair-release
2009-09-10 16:52:21 -07:00
Xavier Ducrohet
a4faa18b6f
am 030df428: am 85762123: Merge change 24584 into eclair
...
Merge commit '030df428443735eed084286564407198792daa82'
* commit '030df428443735eed084286564407198792daa82':
Add support for @pending annotation.
2009-09-10 15:19:55 -07:00
Xavier Ducrohet
c35eaf7e98
am aca5e20e: am a3c35d19: Merge change 24565 into eclair
...
Merge commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea'
* commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea':
Add missing @Override to DroidDoc and ApiCheck
2009-09-10 15:19:51 -07:00
Xavier Ducrohet
030df42844
am 85762123: Merge change 24584 into eclair
...
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp
* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
Add support for @pending annotation.
2009-09-10 15:10:39 -07:00
Xavier Ducrohet
aca5e20e4a
am a3c35d19: Merge change 24565 into eclair
...
Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp
* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
Add missing @Override to DroidDoc and ApiCheck
2009-09-10 15:10:36 -07:00
Android (Google) Code Review
857621233a
Merge change 24584 into eclair
...
* changes:
Add support for @pending annotation.
2009-09-10 18:03:47 -04:00
Android (Google) Code Review
a3c35d197e
Merge change 24565 into eclair
...
* changes:
Add missing @Override to DroidDoc and ApiCheck
2009-09-10 18:03:32 -04:00
Xavier Ducrohet
02e14df59f
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
2009-09-10 14:50:12 -07:00
Xavier Ducrohet
5ee390d856
Add missing @Override to DroidDoc and ApiCheck
...
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
2009-09-10 14:46:21 -07:00
Andy McFadden
cae7d6735e
am 42fe578d: am 2c86bfd2: Sleazy workaround for webkit build failures.
...
Merge commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'
* commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
Sleazy workaround for webkit build failures.
2009-09-10 10:55:03 -07:00
Andy McFadden
42fe578dae
am 2c86bfd2: Sleazy workaround for webkit build failures.
...
Merge commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c' into eclair-plus-aosp
* commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c':
Sleazy workaround for webkit build failures.
2009-09-10 10:45:25 -07:00
Andy McFadden
2c86bfd285
Sleazy workaround for webkit build failures.
...
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.
This change truncates the "product" directory name to "pr", reducing the
command line by a few KB. This only affects sim-eng builds.
The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
2009-09-10 10:05:14 -07:00
The Android Open Source Project
1279563c4b
ERC72
2009-09-10 08:37:47 -07:00
Ben Cheng
db95cb4426
Enable Dalvik JIT by default for the master branch.
2009-09-09 13:03:44 -07:00
The Android Open Source Project
d305f54c8e
ERC71
2009-09-09 10:44:02 -07:00
The Android Open Source Project
95d30322c5
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-09 10:43:49 -07:00
Andrei Popescu
03f9f2ee11
am bf9b8e89: am 270de928: Cleanstep required by switching back to JSC in the browser
...
Merge commit 'bf9b8e8904b930028adaf94c7139b714cef3d641'
* commit 'bf9b8e8904b930028adaf94c7139b714cef3d641':
Cleanstep required by switching back to JSC in the browser
2009-09-08 15:59:59 -07:00
Alexey Tarasov
1fcce11eed
Cosmetic fixes in css/js
2009-09-08 15:29:54 -07:00
Andrei Popescu
bf9b8e8904
am 270de928: Cleanstep required by switching back to JSC in the browser
...
Merge commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0' into eclair-plus-aosp
* commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0':
Cleanstep required by switching back to JSC in the browser
2009-09-08 13:39:46 -07:00
Andrei Popescu
270de9284a
Cleanstep required by switching back to JSC in the browser
2009-09-08 19:47:22 +01:00
The Android Open Source Project
462edda61b
ERC70
2009-09-08 07:27:14 -07:00
The Android Open Source Project
c53959fdc1
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-08 07:26:56 -07:00
android-build SharedAccount
63c11540ac
ERC65B - after the fact
2009-09-07 00:40:35 -07:00
Jean-Baptiste Queru
8eb47bb13d
am 6d547933: merge from open-source master
...
Merge commit '6d547933b8aa3a811499708bc8a4fea551599359'
* commit '6d547933b8aa3a811499708bc8a4fea551599359':
2009-09-04 11:06:01 -07:00
Jean-Baptiste Queru
6d547933b8
merge from open-source master
2009-09-04 07:50:42 -07:00
Mike Lockwood
451f14f769
am 356f7a2f: am 3e747ac3: Add clean step for /system/bin/bugreport symlink
...
Merge commit '356f7a2f15984e499f494f840a6ee0fb8e7826fe'
* commit '356f7a2f15984e499f494f840a6ee0fb8e7826fe':
Add clean step for /system/bin/bugreport symlink
2009-09-03 14:24:31 -07:00
