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.
Merge commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f' into eclair-plus-aosp
* commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f':
doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
Merge commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9'
* commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9':
docs: small edit to live wallpaper sentence
Merge commit '50e72439648dc36205ad307a07f3050270346308'
* commit '50e72439648dc36205ad307a07f3050270346308':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp
* commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7':
docs: small edit to live wallpaper sentence
Merge commit '5ff60dff181fc4982c822ef97e14a293af66a246' into eclair-plus-aosp
* commit '5ff60dff181fc4982c822ef97e14a293af66a246':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
