Merge commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48' into eclair-plus-aosp
* commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48':
Adding list of articles to docs/html/resources/articles/index.jd.
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.
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-plus-aosp
* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-plus-aosp
* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-plus-aosp
* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-plus-aosp
* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-plus-aosp
* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
add screenshots for the Bluetooth Chat sample app
* 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.
Merge commit '06ddc67797388da6260e43579c7ebd506b5b376c' into eclair-plus-aosp
* commit '06ddc67797388da6260e43579c7ebd506b5b376c':
docs: remove all content from the older sdk download,
* changes:
docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the "older sdks" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.
install, and requirements pages and redirect to the new sdk
pages. Also update the "older sdks"
doc to include all version-specific sdks.
also update the robots file to disallow indexing
of the old sdk docs.
Merge commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531' into eclair-plus-aosp
* commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531':
docs: update the publishing guide to revise the updating section
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-plus-aosp
* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
docs: add new document for the win usb driver;
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
