Merge commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc'
* commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc':
Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.
Merge commit 'affb4e7694a4184d257d0ac71e3119e015b558e2'
* commit 'affb4e7694a4184d257d0ac71e3119e015b558e2':
Make sure to map undefined OES functions to their non-OES counterpart if it exists.
Merge commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d'
* commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d':
Modify and turn on the test case for video recording in portrait mode.
Merge commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2'
* commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2':
use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
* changes:
Vorbis render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the Vorbis render thread priority to the default for audio threads. Reference bug 1800905
Merge commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742'
* commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742':
Fix a media server crash (bug 1807910): part one
Merge commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a'
* commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a':
integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
* changes:
CheckedTextView is abstract but can be inflated from XML. Let's be consistent and allow it to be used from Java code as well by making it non-abstract.
* changes:
Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.
Merge commit '998234ed4ab957b9ddb15f4ad5341885a6a649c2' into donut
* commit '998234ed4ab957b9ddb15f4ad5341885a6a649c2':
AI 147947: update the sitemap. add disallow in robots file for the sdk/preview/
Merge commit '752aaf92a8eb3d982cb870ac74f86315f9c5a918' into donut
* commit '752aaf92a8eb3d982cb870ac74f86315f9c5a918':
AI 147874: Fix format and link errors in docs.
Merge commit '5fe696f7b0ffe3b40d75026b16983246ec4cda4c' into donut
* commit '5fe696f7b0ffe3b40d75026b16983246ec4cda4c':
AI 147814: tweaks to the hello world tutorial.
Merge commit '0ee4f86c92b9372489bace84276b81e8b37827df' into donut
* commit '0ee4f86c92b9372489bace84276b81e8b37827df':
AI 147811: typo fixes and edits for upgrading and installing docs
Merge commit '263ed76bf6fe4cfa368dec0a04ecb4ddea33095e' into donut
* commit '263ed76bf6fe4cfa368dec0a04ecb4ddea33095e':
AI 147810: fix links on the homepage
Merge commit 'ce878bef710c6d1e6881949c82b1293fb8435715' into donut
* commit 'ce878bef710c6d1e6881949c82b1293fb8435715':
AI 147804: add new doc about Dialogs
Merge commit 'b8b3645a9799c38ad68549316ebbf7a4849f2e0c' into donut
* commit 'b8b3645a9799c38ad68549316ebbf7a4849f2e0c':
AI 147803: add docs and images for docs on Toast and Notification docs
Merge commit '596451ce46f6c7c49e399d3b4025d0f42c5cb979' into donut
* commit '596451ce46f6c7c49e399d3b4025d0f42c5cb979':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Merge commit '6fc27f79b4efb0a8fdaf393eb35fe5925541a893' into donut
* commit '6fc27f79b4efb0a8fdaf393eb35fe5925541a893':
AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
Merge commit '47f3a7ae793d271b6731436eb854fc8ae7cb9871' into donut
* commit '47f3a7ae793d271b6731436eb854fc8ae7cb9871':
AI 147782: Add a link to the JET docs from media index page.
Merge commit '4afe275c984fc943d11b26857aa81c501f5b294f' into donut
* commit '4afe275c984fc943d11b26857aa81c501f5b294f':
AI 147780: add summary of "future-proofing your apps" and links
Merge commit '094d9af4d365b6cad2a346e4cb30f7edd7593ba3' into donut
* commit '094d9af4d365b6cad2a346e4cb30f7edd7593ba3':
AI 147777: add release notes links for each download page
Merge commit '6bbf38916957aba00e85af83923c232ccae5a59d' into donut
* commit '6bbf38916957aba00e85af83923c232ccae5a59d':
AI 147767: set 1.1 download page to include "not current" disclaimer
Merge commit '7b54237c8b662b7c1069e00d8dd6aa7e4d619e87' into donut
* commit '7b54237c8b662b7c1069e00d8dd6aa7e4d619e87':
AI 147755: Add sizes and checksums for 1.5 SDK downloadables.
Merge commit '6f1826cb0cf23e0027817f5a26cf1181f85e1085' into donut
* commit '6f1826cb0cf23e0027817f5a26cf1181f85e1085':
AI 147752: dang, there was another unclosed tag... tested it this time.
Merge commit 'a055e5ea1d87a958cc2c0ea82fe7026b205578b9' into donut
* commit 'a055e5ea1d87a958cc2c0ea82fe7026b205578b9':
AI 147742: close <code> tag and remove some bolding
Merge commit 'b867019173d20cd4fd7ee79a3ce924096e95a241' into donut
* commit 'b867019173d20cd4fd7ee79a3ce924096e95a241':
AI 147725: Some fixes for the CTS test runner. One is a
Merge commit '14533d2652ce786f1ca84af1b54adaa201455989' into donut
* commit '14533d2652ce786f1ca84af1b54adaa201455989':
AI 147720: Set default language for NL to nl.
