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
Merge commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-plus-aosp
* commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
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: I337b264437dee81aed1bb9a1fbd11ccc9f506e88
This supports specifying a file system path to test(s) to run. The path can be
a java test class file, a java package directory, or a parent directory
containing many tests.
This change allows users to run tests independently from test_defs.xml.
BUG 2133198
Merge commit 'cb69dd6822811de279ef88dd85add26ef2438e15'
* commit 'cb69dd6822811de279ef88dd85add26ef2438e15':
Fix how the monkey counts events for scripts.
Merge commit 'c21395950ee1aca0f9e69ca5cc87ed40a53420bc' into eclair-mr2-plus-aosp
* commit 'c21395950ee1aca0f9e69ca5cc87ed40a53420bc':
Fix how the monkey counts events for scripts.
Merge commit 'ccddf0ac0b0b56169b546b36183594688959561f'
* commit 'ccddf0ac0b0b56169b546b36183594688959561f':
SDK Manager: properly reset tree when changing updates only
Merge commit '12dac0b13bce0aa19cdc933107e1a733bc62e116' into eclair-mr2-plus-aosp
* commit '12dac0b13bce0aa19cdc933107e1a733bc62e116':
SDK Manager: properly reset tree when changing updates only
Merge commit 'e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-mr2
* commit 'e7ff49b82da151037ef5f221a95b95c897deab30':
SDK Manager: properly reset tree when changing updates only
Merge commit 'e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-plus-aosp
* commit 'e7ff49b82da151037ef5f221a95b95c897deab30':
SDK Manager: properly reset tree when changing updates only
Merge commit 'a6db40906940e2fd942e2343b9d2d709f7fc71f9'
* commit 'a6db40906940e2fd942e2343b9d2d709f7fc71f9':
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
