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 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1' into eclair-plus-aosp
* commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1':
add -since flag to droiddoc options for 7.xml,
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.
Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp
* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp
* commit '725218602e8505cd6fe3075253fcb792727e2431':
Avoid a crash trying to get a substring whose start is after its end.
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.
* changes:
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 '54bb575e85d1e40efbfbb868f37553cdd8ed318f' into eclair-plus-aosp
* commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f':
Fix the dependencies to make online-sdk-docs.
Merge commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a' into eclair
* commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a':
Fix the dependencies to make online-sdk-docs.
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-plus-aosp
* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-plus-aosp
* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
Layoutlib: Add a constant for default density value.
Merge commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2' into eclair-plus-aosp
* commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2':
Fix#2320798: Device hang then runtime restart
Merge commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2' into eclair-plus-aosp
* commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2':
fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
When a surface is removed from the screen while it holds a "freeze lock", the
release of that lock happens in the destructor as a "safety net". However, it
doesn't trigger an update at that point.
Make sure that "freeze locks" are released from the transaction at the point
a surface is removed from the screen (if it's not on screen, it shouldn't
prevent the screen to redraw, and therefore cannot hold a freeze lock).
The refresh corresponding to that transaction will pick it up as soon as possible.
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 '083a557c25e0032bc4900f335b6643d0badd09ce' into eclair-plus-aosp
* commit '083a557c25e0032bc4900f335b6643d0badd09ce':
fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-plus-aosp
* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-plus-aosp
* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
