Scott Main
c49f864695
resolved conflicts for merge of aaf8a9d8 to master
2009-12-16 11:08:26 -08:00
Dirk Dougherty
c0d7e1ccda
am 4a2d630f: am 6ccc515c: Merge change I8385f59d into eclair
...
Merge commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2'
* commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2':
sdk doc change for esr: Cleanup for resources tab content.
2009-12-16 10:32:20 -08:00
Scott Main
aaf8a9d885
am 218c0763: Merge change Ib43ec8f6 into eclair
...
Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp
* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
docs: fix some typos in the manifest docs samples and
2009-12-16 10:28:11 -08:00
Dirk Dougherty
4a2d630f68
am 6ccc515c: Merge change I8385f59d into eclair
...
Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp
* commit '6ccc515c7f705a66718d0138a421e29186667b9e':
sdk doc change for esr: Cleanup for resources tab content.
2009-12-16 10:27:47 -08:00
Android (Google) Code Review
218c0763d5
Merge change Ib43ec8f6 into eclair
...
* changes:
docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.
2009-12-16 10:05:10 -08:00
Dirk Dougherty
50bfb39c55
sdk doc change for esr: Cleanup for resources tab content.
...
Bug:2160782
Change-Id: I8385f59d764156ccc318f71e5d344c7f33330c40
2009-12-15 19:24:58 -08:00
Dirk Dougherty
692bf86e67
am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair
...
Merge commit '479a49f74f77855825ba69b105c065422c24246a'
* commit '479a49f74f77855825ba69b105c065422c24246a':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
2009-12-15 15:04:00 -08:00
Dirk Dougherty
479a49f74f
am 7585586c: Merge change Ib1eb2e9e into eclair
...
Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp
* commit '7585586ce5b5de699b95125672e29eaf70876727':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
2009-12-15 07:40:02 -08:00
Scott Main
b43ec8f631
docs: fix some typos in the manifest docs samples and
...
remove the "one or more of" phrase from the syntax snippet
because it interferes with the syntax coloring.
2009-12-14 14:37:53 -08:00
Dirk Dougherty
22558d0be8
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
...
Bug: 2160782
Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221
2009-12-14 11:40:02 -08:00
Scott Main
514ef96827
am 94065a29: am f210f048: am 88ff62db: Merge change I06398298 into eclair
...
Merge commit '94065a29c1c68ecf6aa0979a4c91f2616227f264'
* commit '94065a29c1c68ecf6aa0979a4c91f2616227f264':
docs: add images used in BT developer guide.
2009-12-10 23:45:48 -08:00
Scott Main
f1ec19e0f3
am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
...
Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d'
* commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d':
docs: add the Bluetooth developer guide,
2009-12-10 23:43:12 -08:00
Scott Main
94065a29c1
am f210f048: am 88ff62db: Merge change I06398298 into eclair
...
Merge commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed' into eclair-mr2-plus-aosp
* commit 'f210f048f754e5c39c192ecdbadd3aeac26471ed':
docs: add images used in BT developer guide.
2009-12-10 18:07:53 -08:00
Scott Main
4570dfa201
am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
...
Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp
* commit '7b0463a949b57620680b95e45c66a05f67426b74':
docs: add the Bluetooth developer guide,
2009-12-10 17:53:27 -08:00
Scott Main
fbdd809d84
am 88ff62db: Merge change I06398298 into eclair
...
Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-plus-aosp
* commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1':
docs: add images used in BT developer guide.
2009-12-09 18:25:37 -08:00
Scott Main
fe7f27aabf
docs: add images used in BT developer guide.
...
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
2009-12-09 18:16:02 -08:00
Scott Main
0ee7706c59
am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
...
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
2009-12-09 18:06:58 -08:00
Scott Main
ed2a70d649
docs: add the Bluetooth developer guide,
...
and make some revisions to the BT javadocs
2009-12-09 17:59:38 -08:00
Scott Main
6b661d28a0
am ea01f514: am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b'
* commit 'ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b':
docs: fix markup error in xml sample
2009-12-04 04:26:33 -08:00
Scott Main
ea01f514e1
am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp
* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample
2009-12-03 16:35:39 -08:00
Scott Main
0fed723ba4
am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-plus-aosp
* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample
2009-12-03 11:54:36 -08:00
Scott Main
33e0f00e95
docs: fix markup error in xml sample
2009-12-03 11:33:25 -08:00
Dirk Dougherty
0f29956e43
am fe4e74b6: am 233c50e4: am 43810507: Merge change Ic8231560 into eclair
...
Merge commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72'
* commit 'fe4e74b62de9348b6bf3322735e7fba090e3dd72':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-02 20:28:55 -08:00
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
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
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
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
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
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
Dirk Dougherty
f4b5540b35
doc change only: add screens support doc
2009-10-21 18:32:24 -07:00
Scott Main
f90178d08d
docs only.
...
fix some typos.
2009-10-21 18:31:54 -07:00
Jeff Sharkey
9158be45af
am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
...
Merge commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876' into eclair-plus-aosp
* commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876':
Fix spacing to escape "false" correctly.
2009-10-20 16:34:05 -07:00
Jeff Sharkey
d7bc654626
Fix spacing to escape "false" correctly.
2009-10-20 16:02:01 -07:00
Scott Main
f3bc5349b2
docs: fix doc error in dialog example snippet (no not merge)
...
bug: 2160782
2009-10-16 17:40:36 -07:00
Scott Main
108f5ac35d
am 0712f24d: am a486f554: am 7f66dbce: Merge change Ic37381fb into eclair
...
Merge commit '0712f24dbf14473cb55e5b609c3418610b77d406'
* commit '0712f24dbf14473cb55e5b609c3418610b77d406':
docs: fix doc error in dialog example snippet
2009-10-16 15:02:20 -07:00
Scott Main
0712f24dbf
am a486f554: am 7f66dbce: Merge change Ic37381fb into eclair
...
Merge commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f' into eclair-mr2-plus-aosp
* commit 'a486f554aa494dfeea4d63fde0d533ea9e1cfe2f':
docs: fix doc error in dialog example snippet
2009-10-16 14:44:05 -07:00
Scott Main
d8d7d53bd7
am 7f66dbce: Merge change Ic37381fb into eclair
...
Merge commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9' into eclair-plus-aosp
* commit '7f66dbcec37bdb154db0e7c95c73ecd257bc38c9':
docs: fix doc error in dialog example snippet
2009-10-16 14:32:17 -07:00
Scott Main
c37381fbee
docs: fix doc error in dialog example snippet
...
bug: 2160782
2009-10-16 14:08:37 -07:00
Katarina Stenstedt
e194c5f35d
am ca190523: am dc884053: am 20972da0: New localization document and tutorial
...
Merge commit 'ca190523d1f19df0b6850908cd422cd7797c0d23'
* commit 'ca190523d1f19df0b6850908cd422cd7797c0d23':
New localization document and tutorial
2009-09-25 11:17:02 -07:00
Katarina Stenstedt
ca190523d1
am dc884053: am 20972da0: New localization document and tutorial
...
Merge commit 'dc884053ed0087c2d71038f4e3d35c12d7ec8348' into eclair-plus-aosp
* commit 'dc884053ed0087c2d71038f4e3d35c12d7ec8348':
New localization document and tutorial
2009-09-24 20:38:35 -07:00
Katarina Stenstedt
dc884053ed
am 20972da0: New localization document and tutorial
...
Merge commit '20972da079adb6e53fe5f8758aa473d9d46a1b54' into eclair
* commit '20972da079adb6e53fe5f8758aa473d9d46a1b54':
New localization document and tutorial
2009-09-24 20:33:34 -07:00
