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.
Merge commit 'd46629fd94271a59419263372ee53d2a46a4507c'
* commit 'd46629fd94271a59419263372ee53d2a46a4507c':
Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit 'da9996d2ced44fb42fe4c47796af685ae4208a9c'
* commit 'da9996d2ced44fb42fe4c47796af685ae4208a9c':
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit '9e5a3f759169871996c7d7203e4de6454b94c47f'
* commit '9e5a3f759169871996c7d7203e4de6454b94c47f':
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit '6ec0e33eeb4040494e4d6a3e260cdaf0c620eb83' into eclair-mr2-plus-aosp
* commit '6ec0e33eeb4040494e4d6a3e260cdaf0c620eb83':
Add support to run only tests in a given java package.
Merge commit '1dcfd370d6a48e04a9ea302d289a409893096954' into eclair-mr2-plus-aosp
* commit '1dcfd370d6a48e04a9ea302d289a409893096954':
Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit 'cf89eb6c2d1844c0701b0ba707a3e4fb9544af44' into eclair-mr2-plus-aosp
* commit 'cf89eb6c2d1844c0701b0ba707a3e4fb9544af44':
Add android-5 platform to the NDK.
Merge commit '476ba9449a3eeb997312ec35ab02a08cd5f7bf47' into eclair-mr2-plus-aosp
* commit '476ba9449a3eeb997312ec35ab02a08cd5f7bf47':
Allow applications to target future API levels
Merge commit '1a4a01d6a78f30067d75344e11a7cfa32ca9d7fd' into eclair-mr2-plus-aosp
* commit '1a4a01d6a78f30067d75344e11a7cfa32ca9d7fd':
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit '1cd617413095758758beef03e3f45d26e9ad7751' into eclair-mr2
* commit '1cd617413095758758beef03e3f45d26e9ad7751':
Add support to run only tests in a given java package.
Merge commit 'b562394bfe9d8df6fcb106eb58c42396d7330b79' into eclair-mr2-plus-aosp
* commit 'b562394bfe9d8df6fcb106eb58c42396d7330b79':
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
