Dirk Dougherty
fe4e74b62d
am 233c50e4: am 43810507: Merge change Ic8231560 into eclair
...
Merge commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9' into eclair-mr2-plus-aosp
* commit '233c50e4aa6de6f77b90c5c65f956f9f4251b5a9':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 09:57:17 -08:00
Dirk Dougherty
f37314c2be
am 43810507: Merge change Ic8231560 into eclair
...
Merge commit '43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-plus-aosp
* commit '43810507b75cd492e8177ee082e688f87f0ab49c':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-01 22:46:30 -08:00
Dirk Dougherty
7500f341dd
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
...
Bug: 2160782
Change-Id: Ic8231560ef1bc036cfd5d242c65f654cb110fc6b
2009-12-01 19:27:26 -08:00
Dirk Dougherty
5a25769584
am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
...
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979'
* commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 16:05:56 -08:00
Dirk Dougherty
dd6a5895f1
am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
...
Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp
* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 14:31:01 -08:00
Dirk Dougherty
b491e59ea2
am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
...
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-plus-aosp
* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 13:55:11 -08:00
Dirk Dougherty
bca9f1bbb3
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
...
Bug: 2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
2009-11-23 13:23:46 -08:00
Scott Main
da21830f47
am cfd1458a: am 9d6704f9: am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
...
Merge commit 'cfd1458a768cb4bc28fa84093e30809ba1e6bfd9'
* commit 'cfd1458a768cb4bc28fa84093e30809ba1e6bfd9':
docs: misc edits to samples page and intro docs
2009-11-18 18:01:41 -08:00
Scott Main
cfd1458a76
am 9d6704f9: am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
...
Merge commit '9d6704f9f1d078f066fb8f5568179fd0743de406' into eclair-mr2-plus-aosp
* commit '9d6704f9f1d078f066fb8f5568179fd0743de406':
docs: misc edits to samples page and intro docs
2009-11-18 17:55:27 -08:00
Scott Main
e252b2170e
am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
...
Merge commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-plus-aosp
* commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8':
docs: misc edits to samples page and intro docs
2009-11-18 17:48:13 -08:00
Android (Google) Code Review
afcd516e3e
Merge change Iaae72f66 into eclair-sdk
...
* changes:
docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
2009-11-18 14:08:08 -08:00
Scott Main
351367ca1a
am 63070f08: am 8faa61c3: am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
...
Merge commit '63070f08a65d2e5c4d7b6e6969689720dcaf7a4b'
* commit '63070f08a65d2e5c4d7b6e6969689720dcaf7a4b':
docs: update the publishing guide to revise the updating section
2009-11-16 14:52:42 -08:00
Scott Main
63070f08a6
am 8faa61c3: am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
...
Merge commit '8faa61c3304392a9ab02387b1adad49dc8a5e488' into eclair-mr2-plus-aosp
* commit '8faa61c3304392a9ab02387b1adad49dc8a5e488':
docs: update the publishing guide to revise the updating section
2009-11-16 14:35:10 -08:00
Scott Main
dbaf472566
am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
...
Merge commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531' into eclair-plus-aosp
* commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531':
docs: update the publishing guide to revise the updating section
2009-11-15 19:23:20 -08:00
Scott Main
bbfc44acab
docs: update the publishing guide to revise the updating section
...
bug 1755357
2009-11-12 21:44:58 -08:00
Scott Main
95594cce49
am 022a38a0: am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
...
Merge commit '022a38a00a460dae1f45bb532780b519048e2dd8'
* commit '022a38a00a460dae1f45bb532780b519048e2dd8':
docs: add new document for the win usb driver;
2009-11-06 16:22:30 -08:00
Scott Main
022a38a00a
am 3bde388a: am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
...
Merge commit '3bde388ac2b80c9d86553552eaddf762fc9514a4' into eclair-mr2-plus-aosp
* commit '3bde388ac2b80c9d86553552eaddf762fc9514a4':
docs: add new document for the win usb driver;
2009-11-06 16:10:19 -08:00
Scott Main
eefe297249
am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
...
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-plus-aosp
* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
docs: add new document for the win usb driver;
2009-11-06 15:48:20 -08:00
Scott Main
ad68fdd702
docs: add new document for the win usb driver;
...
remove usb guide from the device document.
2009-11-06 13:48:21 -08:00
Scott Main
8d86952068
docs: misc edits to samples page and intro docs
...
make samples page accessible from offline version instead
of redirecting to the user filesystem and include instructions
for creating projects based on the sample apps.
fix a link and add some content to the What is android doc.
bug: 2160782
2009-11-05 16:33:30 -08:00
Dirk Dougherty
3bb6baa349
am 759ac9e3: am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4'
* commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4':
doc change: misc doc fixes.
2009-11-03 00:09:57 -08:00
Dirk Dougherty
759ac9e3da
am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp
* commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e':
doc change: misc doc fixes.
2009-11-02 18:29:52 -08:00
Dirk Dougherty
f93cf36964
am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp
* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
doc change: misc doc fixes.
2009-11-02 18:27:55 -08:00
Dirk Dougherty
6b13bc043e
doc change: misc doc fixes.
...
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
2009-10-30 19:44:22 -07:00
Dirk Dougherty
c53793d206
am 524c4e72: am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '524c4e720d3811230ef9f1707efa280f8f00b851'
* commit '524c4e720d3811230ef9f1707efa280f8f00b851':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 14:44:59 -07:00
Dirk Dougherty
524c4e720d
am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '9ac642a924a85d26fb093a0c4aa0a20817927935' into eclair-mr2-plus-aosp
* commit '9ac642a924a85d26fb093a0c4aa0a20817927935':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 14:00:39 -07:00
Dirk Dougherty
b7e7b71065
am a292fefe: am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit 'a292fefeb77ed8e33afd7451090c3e21761fd266'
* commit 'a292fefeb77ed8e33afd7451090c3e21761fd266':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 23:54:35 -07:00
Dirk Dougherty
a292fefeb7
am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit '4c071f0d69ac0e3eaf386797faeb52d63de30806' into eclair-mr2-plus-aosp
* commit '4c071f0d69ac0e3eaf386797faeb52d63de30806':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 12:45:22 -07:00
Dirk Dougherty
cdf2c1bf26
am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
...
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-plus-aosp
* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:47:47 -07:00
Dirk Dougherty
00dc5756b1
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
...
Bug: 2160782
Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
2009-10-27 18:58:54 -07:00
Dirk Dougherty
91eeda64b6
am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
...
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-plus-aosp
* commit '59625fa86ad0e520931361aba120e2d868f01618':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-26 18:42:44 -07:00
Dirk Dougherty
bf15ce6de4
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
...
Bug:2160782
Change-Id: I020b31e10f2733223aa37d03687cf8a63843afa7
2009-10-26 18:19:22 -07:00
Dirk Dougherty
73d64fa200
am 3bf0210d: am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit '3bf0210dca67e534bf8d344575abf32e653c8407'
* commit '3bf0210dca67e534bf8d344575abf32e653c8407':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 19:07:17 -07:00
Dirk Dougherty
8eef2dd945
Merge commit '9b7fb57c' into manualmerge
...
Conflicts:
docs/html/sdk/android-1.5.jd
2009-10-22 18:44:32 -07:00
Dirk Dougherty
3bf0210dca
am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5' into eclair-mr2-plus-aosp
* commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:39:56 -07:00
Dirk Dougherty
26983c69fa
am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
...
Merge commit '86dc4d312216be0b4c2847a1e79d94efaf4b9559' into eclair-plus-aosp
* commit '86dc4d312216be0b4c2847a1e79d94efaf4b9559':
doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:13:49 -07:00
Dirk Dougherty
eeb0b2514a
doc change: incorporate comments on SDK docs and structure.
...
Bug: 2160782
2009-10-22 17:35:02 -07:00
Dirk Dougherty
4f983852fd
am 419264c2: am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit '419264c22c8776274119e66349068f8c712b1c2f'
* commit '419264c22c8776274119e66349068f8c712b1c2f':
doc change: edits to the screens support doc.
2009-10-22 14:35:31 -07:00
Dirk Dougherty
256ca9b93c
am f80cd7bd: am 208e390a: am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f'
* commit 'f80cd7bdc4e6c1c83afb19650e9177ec5e0d8d6f':
doc change only: add screens support doc
2009-10-22 14:35:17 -07:00
Scott Main
3f3b61bd97
resolved conflicts for merge of 618ae454 to master
2009-10-22 14:29:35 -07:00
Dirk Dougherty
9b7fb57c6e
am 96f225af: am 4f82394a: am ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
...
Merge commit '96f225afad61ee701dd84348e380a40ff8900fc0' into eclair-mr2-plus-aosp
* commit '96f225afad61ee701dd84348e380a40ff8900fc0':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
2009-10-22 13:42:49 -07:00
Dirk Dougherty
419264c22c
am 875d235c: am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit '875d235cf1c685597026997bae49ea820351b576' into eclair-mr2-plus-aosp
* commit '875d235cf1c685597026997bae49ea820351b576':
doc change: edits to the screens support doc.
2009-10-22 13:42:24 -07:00
Dirk Dougherty
f80cd7bdc4
am 208e390a: am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit '208e390af0ab1ca5f0cb2000692ea20cf67a9ea3' into eclair-mr2-plus-aosp
* commit '208e390af0ab1ca5f0cb2000692ea20cf67a9ea3':
doc change only: add screens support doc
2009-10-22 13:42:08 -07:00
Scott Main
618ae45494
am df3a7e79: am 3c0c0da9: am f90178d0: docs only. fix some typos.
...
Merge commit 'df3a7e797738587873f1269b2989c516ec302395' into eclair-mr2-plus-aosp
* commit 'df3a7e797738587873f1269b2989c516ec302395':
docs only.
2009-10-22 13:41:44 -07:00
Dirk Dougherty
07bdacfc61
am 4f82394a: am ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
...
Merge commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747' into eclair-plus-aosp
* commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
2009-10-22 13:32:31 -07:00
Dirk Dougherty
72da8a7400
am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
...
Merge commit 'e12191a7ec9ab35e4ce80726be2734881a24a223' into eclair-plus-aosp
* commit 'e12191a7ec9ab35e4ce80726be2734881a24a223':
doc change: edits to the screens support doc.
2009-10-22 13:32:01 -07:00
Dirk Dougherty
f911374ff6
am e5e2c167: am f4b5540b: doc change only: add screens support doc
...
Merge commit 'e5e2c167366ff3823b4096af00b2a2ab2d0e6127' into eclair-plus-aosp
* commit 'e5e2c167366ff3823b4096af00b2a2ab2d0e6127':
doc change only: add screens support doc
2009-10-22 13:31:48 -07:00
Scott Main
59c7022365
am 3c0c0da9: am f90178d0: docs only. fix some typos.
...
Merge commit '3c0c0da95f23712fb926fc9edf4023528eabd868' into eclair-plus-aosp
* commit '3c0c0da95f23712fb926fc9edf4023528eabd868':
docs only.
2009-10-22 13:31:34 -07:00
Jeff Sharkey
5f23370d15
am 4d53dd40: am d7b1d3d4: am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
...
Merge commit '4d53dd40ea5e433da419d0bddb0269a7acb2c268'
* commit '4d53dd40ea5e433da419d0bddb0269a7acb2c268':
Fix spacing to escape "false" correctly.
2009-10-22 09:50:46 -07:00
Jeff Sharkey
4d53dd40ea
am d7b1d3d4: am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
...
Merge commit 'd7b1d3d4b4ff49a4b0872f8e39c71d8867527d63' into eclair-mr2-plus-aosp
* commit 'd7b1d3d4b4ff49a4b0872f8e39c71d8867527d63':
Fix spacing to escape "false" correctly.
2009-10-22 09:34:45 -07:00
