Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-plus-aosp
* commit 'aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Merge commit '940073e267695a7c4a404cb2174b48e893c15a45' into eclair
* commit '940073e267695a7c4a404cb2174b48e893c15a45':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.
Change-Id: I6b97fee06bd4e6dc36c977ffef3c25315469b766
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS 2219284 2198427
Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-plus-aosp
* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '7d2bb73d2039e4acb2b8a9d9bdb3a1ce968a4d59'
* commit '7d2bb73d2039e4acb2b8a9d9bdb3a1ce968a4d59':
Prepare version numbers for next SDK & tools
Merge commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144' into eclair-mr2-plus-aosp
* commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144':
SDK Updater: don't load sdk-repo XML that failed to validate.
Merge commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad' into eclair-mr2-plus-aosp
* commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad':
Prepare version numbers for next SDK & tools
Merge commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-mr2
* commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
SDK Updater: don't load sdk-repo XML that failed to validate.
Merge commit '09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-mr2
* commit '09c5201adca0ceb0e881832d53cfa9e412d07389':
Prepare version numbers for next SDK & tools
Merge commit 'c02e450461779ae16708e337ad7f4eb515cfc3e0'
* commit 'c02e450461779ae16708e337ad7f4eb515cfc3e0':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.
Bugs 2222616, 2218682
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
Merge commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60' into eclair-mr2-plus-aosp
* commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60':
Revert "update demo to use boundary patch"
Merge commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024' into eclair-mr2-plus-aosp
* commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024':
update demo to use boundary patch
Merge commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3' into eclair-mr2-plus-aosp
* commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Merge commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-mr2
* commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Merge commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-plus-aosp
* commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
SDK Updater: don't load sdk-repo XML that failed to validate.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS 2219284 2198427
Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
Merge commit '09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-plus-aosp
* commit '09c5201adca0ceb0e881832d53cfa9e412d07389':
Prepare version numbers for next SDK & tools
