Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp
* commit '05bbeb356286bfb6ddc26ac546cce03334e346dd':
Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2
* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Merge commit '9de0dba37cdb74a21e561c5235757318f1812e3d' into eclair-mr2-plus-aosp
* commit '9de0dba37cdb74a21e561c5235757318f1812e3d':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-mr2
* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp
* commit '7b0463a949b57620680b95e45c66a05f67426b74':
docs: add the Bluetooth developer guide,
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-mr2
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
Merge commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78' into eclair-mr2-plus-aosp
* commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78':
add BluetoothChat sample app to the dev guide
Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp
* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample
Merge commit '7863eb11265cd06ee35a670b5e994d65e31337c3' into eclair-mr2-plus-aosp
* commit '7863eb11265cd06ee35a670b5e994d65e31337c3':
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 '8faa61c3304392a9ab02387b1adad49dc8a5e488' into eclair-mr2-plus-aosp
* commit '8faa61c3304392a9ab02387b1adad49dc8a5e488':
docs: update the publishing guide to revise the updating section
Merge commit '3bde388ac2b80c9d86553552eaddf762fc9514a4' into eclair-mr2-plus-aosp
* commit '3bde388ac2b80c9d86553552eaddf762fc9514a4':
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
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.
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.
Merge commit '875d235cf1c685597026997bae49ea820351b576' into eclair-mr2-plus-aosp
* commit '875d235cf1c685597026997bae49ea820351b576':
doc change: edits to the screens support doc.
