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
Merge commit '7627b95ae6f7c370ead3bd512e7604340ce06250'
* commit '7627b95ae6f7c370ead3bd512e7604340ce06250':
Remove runtest dependency on current dir being build top.
Merge commit 'c5679c41235148b285d6fe5bbbf1780d2a01e234' into eclair-mr2-plus-aosp
* commit 'c5679c41235148b285d6fe5bbbf1780d2a01e234':
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
Merge commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2' into eclair-mr2
* commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2':
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
Merge commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2' into eclair-plus-aosp
* commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2':
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
Merge commit 'cdbfd8ceda1351761925da34b764fd31e352946e' into eclair-mr2-plus-aosp
* commit 'cdbfd8ceda1351761925da34b764fd31e352946e':
Remove runtest dependency on current dir being build top.
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
Merge commit 'cdfea21f9285641d3040d4fb19138873086c9869' into eclair-plus-aosp
* commit 'cdfea21f9285641d3040d4fb19138873086c9869':
Remove runtest dependency on current dir being build top.
Merge commit 'cdfea21f9285641d3040d4fb19138873086c9869' into eclair-mr2
* commit 'cdfea21f9285641d3040d4fb19138873086c9869':
Remove runtest dependency on current dir being build top.
Merge commit '1cd617413095758758beef03e3f45d26e9ad7751' into eclair-plus-aosp
* commit '1cd617413095758758beef03e3f45d26e9ad7751':
Add support to run only tests in a given java package.
Merge commit '9eff6cbfaa210af0f5500f75576b457565cfafae' into eclair-plus-aosp
* commit '9eff6cbfaa210af0f5500f75576b457565cfafae':
Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-plus-aosp
* commit '975491c9ebb8ec659d96318df5f37f92c903f09f':
Add android-5 platform to the NDK.
Merge commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-plus-aosp
* commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6':
Allow applications to target future API levels
Merge commit 'dc0e9bf4759c859f2e707ac2ca4386672d49d734'
* commit 'dc0e9bf4759c859f2e707ac2ca4386672d49d734':
Add support to run only tests in a given java package.
