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 '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.
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 '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.
Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp
* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
docs: fix some typos in the manifest docs samples and
* 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.
Describes work-around for these problems: Sometimes you
can't view manifest files within Eclipse; you can't run
the GestureBuilder sample on the emulator or uninstall it
from the emulator.
Bug: 2315781
Change-Id: Ia36d8e74a9fccd106ce2cc5e9451846aacba9da4
Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp
* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
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.
