Commit Graph

85413 Commits

Author SHA1 Message Date
android-build SharedAccount
137b5056af ERC80 2009-09-18 09:28:56 -07:00
android-build SharedAccount
7b880b586e Merge commit 'goog/eclair' into eclair-release 2009-09-18 09:07:06 -07:00
Ed Heyl
928aec7cb3 Set default build ID to eclair (usually this is overridden). Please do not merge. 2009-09-17 16:28:37 -07:00
Debajit Ghosh
725f73e6af 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.
2009-09-17 16:00:26 -07:00
Debajit Ghosh
5e36c1232d 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.
2009-09-17 15:50:17 -07:00
Debajit Ghosh
2492327c9b fix broken incremental builds due to some voicesearch change. 2009-09-17 15:30:00 -07:00
Android Code Review
9a6b73c0aa Merge change 10642
* changes:
  added linux-sh.mk to support SuperH architecture
2009-09-17 14:52:55 -07:00
Scott Main
a5a849aee7 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.
2009-09-17 12:45:36 -07:00
Scott Main
b66f9b3e36 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.
2009-09-17 12:36:03 -07:00
Scott Main
9958256b20 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.
2009-09-17 12:29:05 -07:00
Ben Murdoch
3fadb8c0d0 resolved conflicts for merge of 72f6e5ac to master 2009-09-17 19:58:11 +01:00
Scott Main
1da823869c 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
2009-09-17 10:54:05 -07:00
Dirk Dougherty
107662f637 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.
2009-09-17 09:57:12 -07:00
Ben Murdoch
72f6e5ac9d am 1f030dcb: Update the cleanspec to clean libwebcore.
Merge commit '1f030dcba62978a8d81a84a5f26c36a2bbf79557' into eclair-plus-aosp

* commit '1f030dcba62978a8d81a84a5f26c36a2bbf79557':
  Update the cleanspec to clean libwebcore.
2009-09-17 08:48:38 -07:00
The Android Open Source Project
d73416d545 ERC79 2009-09-17 08:39:31 -07:00
The Android Open Source Project
8efcf6075b Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-17 08:39:09 -07:00
Xavier Ducrohet
679367142b 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.
2009-09-17 06:38:50 -07:00
Mike Ritter
2f37944a4a 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.
2009-09-17 06:38:46 -07:00
Doug Zongker
acc54d1067 am f1436ccd: am 353448c7: Merge change 24973 into eclair
Merge commit 'f1436ccdea1d63cb2a7345340929efcc4de8b7e9'

* commit 'f1436ccdea1d63cb2a7345340929efcc4de8b7e9':
  increase reserved blocks from 5 to 8
2009-09-17 06:38:43 -07:00
Doug Zongker
aa7e606fc3 am fe0602f6: increase reserved blocks from 5 to 8
Merge commit 'fe0602f60b971c3b350d47115cba188cc67c7038'

* commit 'fe0602f60b971c3b350d47115cba188cc67c7038':
  increase reserved blocks from 5 to 8
2009-09-17 06:38:40 -07:00
Ben Murdoch
1f030dcba6 Update the cleanspec to clean libwebcore.
Change-Id: Ie27e0e1c8a617199f1d8ff0b484936ccd14b04de
2009-09-17 11:29:36 +01:00
Dirk Dougherty
f2ffc36648 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.
2009-09-16 11:30:41 -07:00
Dirk Dougherty
60bbe187da 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.
2009-09-16 11:23:08 -07:00
Dirk Dougherty
c66c90a803 Change sdk doc template so that ADT download link bypasses clickthrough.
Change-Id: Ibea052b718f17043c992af7d5334b1c7e4fe2c6b
2009-09-16 10:11:01 -07:00
The Android Open Source Project
95e92cb00d ERC78 2009-09-16 08:36:49 -07:00
The Android Open Source Project
f48566e4b0 Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-16 08:36:37 -07:00
Xavier Ducrohet
8627291e99 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.
2009-09-15 13:47:17 -07:00
Mike Ritter
31d002062e 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.
2009-09-15 13:45:42 -07:00
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