Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'
* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp
* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp
* commit '063d03ed0882582840c7db610635aa89c1a01eec':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Merge commit '5f6002ec5f52ed164b591cf4b267fe771a81731f'
* commit '5f6002ec5f52ed164b591cf4b267fe771a81731f':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp
* commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Merge commit '186b94fe60a4cede177bace19b68c72c6f475190'
* commit '186b94fe60a4cede177bace19b68c72c6f475190':
upload new dev site robots.txt to disallow old tutorial and
Merge commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6' into eclair-plus-aosp
* commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6':
upload new dev site robots.txt to disallow old tutorial and
Merge commit '5508987bfcdd9a441966893ee21c6cf7803c0b49'
* commit '5508987bfcdd9a441966893ee21c6cf7803c0b49':
docs: add new device features for the uses-feature
Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp
* commit 'e4c2a37624612c9708d0767f8643a10502e6887a':
docs: add new device features for the uses-feature
* changes:
docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
and add a note to the CAMERA permission stating that it enables
the <uses-feature> for camera.
This is an incrimental update for the 2.0.1 docs. More changes
to come for the 2.1 docs to include more features
Merge commit 'b9b9764bbbd668c1bd30a09d7c2c02b684731892'
* commit 'b9b9764bbbd668c1bd30a09d7c2c02b684731892':
docs: update the site homepage with 2.1 announcement
Merge commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970'
* commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970':
docs: update the Bluetooth guide with links to the sample
Merge commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4' into eclair-plus-aosp
* commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4':
docs: update the site homepage with 2.1 announcement
Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp
* commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad':
docs: update the Bluetooth guide with links to the sample
* changes:
docs: update the Bluetooth guide with links to the sample app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
Some recent CLs to the Notepad source files fixed a couple of bugs in the
code:
http://b/issue?id=2266994http://b/issue?id=2266962
This CL includes the newly corrected code in the zip file that developers
download. The zip file was generated as follows:
cd development/tutorials
zip -r /tmp/NotepadCodeLab NotepadCodeLab -x \*Android.mk
This CL also updates the documentation to match the new version of the
code. Thus the code the users generate will include the bug fix.
Merge commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9'
* commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9':
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
