Scott Main
f1bac52fe2
fix search for offline docs. again.
2009-10-26 14:44:48 -07:00
Dirk Dougherty
59de278178
am ee3a3c1f
: am c2c5e505
: doc change: include SDK Tools in notice to 1.6 developers.
...
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-plus-aosp
* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
doc change: include SDK Tools in notice to 1.6 developers.
2009-10-26 11:28:19 -07:00
Dirk Dougherty
c2c5e505ac
doc change: include SDK Tools in notice to 1.6 developers.
...
Bug:2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
2009-10-24 14:38:58 -07:00
Scott Main
3f19cc16b6
am 66a27b01
: 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 '66a27b01201027e371b74b0eb18572dfb7303238'
* commit '66a27b01201027e371b74b0eb18572dfb7303238':
docs: implement sdk announcement in a collapsible box
2009-10-23 21:32:32 -07:00
Scott Main
66a27b0120
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
2009-10-23 21:23:04 -07:00
Scott Main
214ea8f14e
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
2009-10-23 21:13:32 -07:00
Scott Main
a1ff4fccee
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-plus-aosp
* commit '3af366ddb2634f97f440b1437bbd21d00101c93b':
docs: implement sdk announcement in a collapsible box
2009-10-23 21:13:26 -07:00
Scott Main
bd4b2f7b7f
am c41d2516
: 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 'c41d251615431a36fc3b664d2bdbe749702a11d9'
* commit 'c41d251615431a36fc3b664d2bdbe749702a11d9':
docs: change javascript so that SDK docs that are not
2009-10-23 17:29:02 -07:00
Scott Main
c41d251615
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
2009-10-23 17:19:06 -07:00
Scott Main
de5108cc5e
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-plus-aosp
* commit 'e0ac5c3e86bf9980ab9181b1cebdf937a8eb36e9':
docs: change javascript so that SDK docs that are not
2009-10-23 17:08:49 -07:00
Scott Main
11cb880f1e
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
2009-10-23 17:08:14 -07:00
Scott Main
462cc37742
docs: implement sdk announcement in a collapsible box
...
and revise the 'special' box color and add rounded corners.
2009-10-23 16:47:09 -07:00
Scott Main
3bdae948b1
am ac1e24cc
: am 7a0ec6b5
: am f963ee63
: am 60dba894
: docs: add eclair logo for homepage
...
Merge commit 'ac1e24ccd622b17f5054460b40baad2e07585781'
* commit 'ac1e24ccd622b17f5054460b40baad2e07585781':
docs: add eclair logo for homepage
2009-10-23 13:32:09 -07:00
Scott Main
ac1e24ccd6
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
2009-10-23 13:21:18 -07:00
Scott Main
5719fe7954
am f963ee63
: am 60dba894
: docs: add eclair logo for homepage
...
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-plus-aosp
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
2009-10-23 13:10:48 -07:00
Scott Main
7a0ec6b566
am f963ee63
: am 60dba894
: docs: add eclair logo for homepage
...
Merge commit 'f963ee638c974942ad99ff4ca9ec985d489e5388' into eclair-mr2
* commit 'f963ee638c974942ad99ff4ca9ec985d489e5388':
docs: add eclair logo for homepage
2009-10-23 13:10:12 -07:00
Scott Main
0d8872e6f2
docs: change javascript so that SDK docs that are not
...
listed in the left nav do not highlight parent index documents
2009-10-23 13:05:56 -07:00
Scott Main
60dba89451
docs: add eclair logo for homepage
2009-10-23 12:22:42 -07:00
Doug Zongker
e60ff98d3b
am 48324393
: am 5f5f08dd
: stop adding ota-rel-keys tag when signing
...
Merge commit '4832439384f5b1a58a79cc087655879fbd2f527d'
* commit '4832439384f5b1a58a79cc087655879fbd2f527d':
stop adding ota-rel-keys tag when signing
2009-10-22 19:06:15 -07:00
Doug Zongker
4832439384
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
2009-10-22 16:46:31 -07:00
Doug Zongker
5f5f08dd22
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.
2009-10-22 16:09:34 -07:00
Dirk Dougherty
f3cc23fc8e
am 99dd0f86
: am 31150b29
: am f03f574a
: am 3d3d7b7e
: doc change: template changes for new SDK doc structure.
...
Merge commit '99dd0f8604319dd1316045e74de4296fff42810a'
* commit '99dd0f8604319dd1316045e74de4296fff42810a':
doc change: template changes for new SDK doc structure.
2009-10-22 11:51:14 -07:00
Dirk Dougherty
12b198e0a7
am 308228ba
: am 3b5065ff
: am 51da2c57
: am fce6b45f
: doc change: template/asset changes for sdk package.
...
Merge commit '308228baa983d5216a7f3bfaff1547f88a99465b'
* commit '308228baa983d5216a7f3bfaff1547f88a99465b':
doc change: template/asset changes for sdk package.
2009-10-22 11:51:10 -07:00
Dirk Dougherty
99dd0f8604
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.
2009-10-22 11:41:38 -07:00
Dirk Dougherty
308228baa9
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.
2009-10-22 11:41:34 -07:00
Dirk Dougherty
daeda811ab
am f03f574a
: am 3d3d7b7e
: doc change: template changes for new SDK doc structure.
...
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-plus-aosp
* commit 'f03f574a021e412b2060116c1112b62b4c21c2fe':
doc change: template changes for new SDK doc structure.
2009-10-22 11:31:15 -07:00
Dirk Dougherty
db02360018
am 51da2c57
: am fce6b45f
: doc change: template/asset changes for sdk package.
...
Merge commit '51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-plus-aosp
* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
doc change: template/asset changes for sdk package.
2009-10-22 11:31:11 -07:00
Dirk Dougherty
3d3d7b7efd
doc change: template changes for new SDK doc structure.
...
Bug:2160782
2009-10-21 19:52:52 -07:00
Dirk Dougherty
fce6b45f62
doc change: template/asset changes for sdk package.
2009-10-16 17:14:33 -07:00
Android (Google) Code Review
dc54d239a2
Merge change I29b5b2d9
...
* changes:
Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 11:51:30 -04:00
Doug Zongker
441dd2b016
am 160028f8
: am f2b32f2a
: resolved conflicts for merge of cfd7db6d
to eclair
...
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'
* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
move recovery image to the top of the OTA package
2009-10-12 12:40:19 -07:00
Marco Nelissen
a470587e5c
am fb74a21f
: am f885d876
: Merge change I2bdc7ec9 into eclair
...
Merge commit 'fb74a21f4792e08c1ebee5d0347698885e31d805'
* commit 'fb74a21f4792e08c1ebee5d0347698885e31d805':
Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-12 11:41:42 -07:00
Scott Main
67484da8a7
am b268d30a
: am 5f0241f5
: am 37bfad5c
: docs only. fix FF2 browser bug in header layout
...
Merge commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289'
* commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289':
docs only.
2009-10-12 11:41:10 -07:00
Gaurav Mathur
29b5b2d94f
Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-08 23:54:35 -07:00
Doug Zongker
7484d0e04a
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
2009-10-07 17:17:45 -07:00
Doug Zongker
f2b32f2a4b
resolved conflicts for merge of cfd7db6d
to eclair
2009-10-07 17:05:36 -07:00
Doug Zongker
cfd7db6d84
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.
2009-10-07 16:26:00 -07:00
Marco Nelissen
7c6d0c2e9e
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.
2009-10-07 11:54:04 -07:00
Scott Main
6eeedf0124
am 5f0241f5
: am 37bfad5c
: docs only. fix FF2 browser bug in header layout
...
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-plus-aosp
* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
docs only.
2009-10-07 11:53:41 -07:00
Android (Google) Code Review
69625548bf
Merge change I239e9f26 into donut
...
* changes:
Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49
)
2009-10-06 14:36:51 -04:00
Android (Google) Code Review
f885d876a2
Merge change I2bdc7ec9 into eclair
...
* changes:
Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 13:48:38 -04:00
Scott Main
5f0241f5d8
am 37bfad5c
: docs only. fix FF2 browser bug in header layout
...
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair
* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
docs only.
2009-10-06 10:14:01 -07:00
Scott Main
37bfad5ce8
docs only.
...
fix FF2 browser bug in header layout
http://b/2031559
Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
Scott Main
07dc76fee2
am 95035daf
: am 39715e2f
: Merge change I962d468d into eclair
...
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'
* commit '95035daffba91e776734c927c01d104c4478bd9e':
revise the deprecated warning to use the 'caution'
2009-10-01 12:22:34 -07:00
Dirk Dougherty
dfea61dedb
am 8fd5fb34
: am 96dcc3a9
: am 7259bae0
: Merge change Ied94685e into donut
...
Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'
* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
Add NDK version reference to template.
2009-10-01 12:13:30 -07:00
Doug Zongker
5eec9dd20f
am da2d06bb
: am c18736b1
: remember device-specific releasetools extensions in target-files
...
Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'
* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
remember device-specific releasetools extensions in target-files
2009-10-01 12:10:52 -07:00
Andy McFadden
d5c079ee27
am 27c6f996
: am c3c136c4
: Merge change I95ed76bd into eclair
...
Merge commit '27c6f996e9636d6af27a72c4817d082151bc1dea'
* commit '27c6f996e9636d6af27a72c4817d082151bc1dea':
Update usage and readme for zipalign.
2009-10-01 11:17:31 -07:00
Scott Main
95035daffb
am 39715e2f
: Merge change I962d468d into eclair
...
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp
* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
revise the deprecated warning to use the 'caution'
2009-09-30 15:33:55 -07:00
Android (Google) Code Review
39715e2f3d
Merge change I962d468d into eclair
...
* changes:
revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
Scott Main
962d468d73
revise the deprecated warning to use the 'caution'
...
style and add a line break
2009-09-30 14:37:32 -07:00