Merge commit '897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
Merge commit 'd51d36fa5444ef5f28dbbe5903949e1a75bb2510' into eclair-plus-aosp
* commit 'd51d36fa5444ef5f28dbbe5903949e1a75bb2510':
Windows SDK: package new tools/find_java.bat
Merge commit 'a6181df43110ce1bea8a856295ce372ab06a7873' into eclair-plus-aosp
* commit 'a6181df43110ce1bea8a856295ce372ab06a7873':
Add Dell Mini5 to the USB driver.
Merge commit 'd98ba32eeff587a30396fa24728a1150de9dc305' into eclair-plus-aosp
* commit 'd98ba32eeff587a30396fa24728a1150de9dc305':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '7d961f86208b35c12867a049d4bb815da72167d3':
DO NOT MERGE Create way to run monkey with multiple scripts.
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 'c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit 'c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
Fix how the monkey counts events for scripts.
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.
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
Merge commit 'b2fa770013cf1b6b8bf0619a946a54feafec5197' into eclair-plus-aosp
* commit 'b2fa770013cf1b6b8bf0619a946a54feafec5197':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Merge commit '2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp
* commit '2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
Add etc1tool to Windows SDK.
Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp
* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
Make the SDK packaging put the samples in the root folder.
Merge commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Merge commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp
* commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5':
Fix compilation error by declaring stride before the first goto
Merge commit 'a8ba4a0e361b44dd5edf954a8b088b310023eb3b' into eclair-plus-aosp
* commit 'a8ba4a0e361b44dd5edf954a8b088b310023eb3b':
Add the tool etc1tool to the sdk.
Merge commit '84d83ba81b076cc6234e3fc92b8367b89fab5561' into eclair-plus-aosp
* commit '84d83ba81b076cc6234e3fc92b8367b89fab5561':
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
Merge commit '7e3d678570d9e9849a249476275fec0a4bb1be1e' into eclair-plus-aosp
* commit '7e3d678570d9e9849a249476275fec0a4bb1be1e':
Fixes bug of the number of injected monkey events.
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.
For historical reasons ETC1 texture files have the
default extension .PKM
This tool relies on the libETC1 library to
compress and decompress the image data.
Merge commit '9c7692aabbf28554810f440fc7ff60fc9c335dc9' into eclair-plus-aosp
* commit '9c7692aabbf28554810f440fc7ff60fc9c335dc9':
Set ro.monkey if it's not set yet.
Merge commit '48f0d8993b5e871dd2695e983266aa655801769e' into eclair-plus-aosp
* commit '48f0d8993b5e871dd2695e983266aa655801769e':
Annouce that Monkey is running.
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp
* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
sdk doc change for esr: fix some broken links to resources files.
Merge commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b' into eclair-plus-aosp
* commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b':
Clean up the SDK and make it compiled and installed in the SDK system image.
Merge commit '1162372c9e7ff4b6e60d247fb057b47f571af86f' into eclair-plus-aosp
* commit '1162372c9e7ff4b6e60d247fb057b47f571af86f':
Use the feature list for the SDK.
