Merge commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681'
* commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681':
Fix ant install when -Dadb.device.arg not provided.
Merge commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810'
* commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810':
Turn of log message that was accidentally left on in an earlier commit.
Merge commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4'
* commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4':
Fix "android create project" to properly set name in strings.xml
Merge commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1'
* commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1':
Support adb device-targeting arguments in ant scripts.
Merge commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142'
* commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142':
Make WVGA/High skins use a higher VM heap size.
Merge commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956'
* commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956':
Add sholes to Windows USB Driver in Eclair.
Merge commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d'
* commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d':
Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
adding a recorder function to collect output into an xml file; adding getvars and listvars command to MonkeyRunner
Add runtest test def for cts-webkit.
Merge commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a'
* commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a':
Three implementations of a live wallpaper showing a spinning cube.
Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-mr2
* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
SDK Manager: suggest install of new platforms, addons or extra packages.
All the commands output go to an *Android Output* buffer which
gets cleaned up before each command run.
Fixed a compilation bug, building from the top Makefile was not
generating a new image.
Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-plus-aosp
* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
SDK Manager: suggest install of new platforms, addons or extra packages.
This ammends the batch file to recognize "android update sdk" to start
the updater UI.
SDK BUG 2173128 2173150
Change-Id: I3a2b9df9a3c52aa86bf34d05389c4034d60d57dc
Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-plus-aosp
* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
New "SDK Launcher" for Windows.
Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-mr2
* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
New "SDK Launcher" for Windows.
Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-plus-aosp
* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
Set SDK Platform/Doc to API 5.
Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-mr2
* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
Set SDK Platform/Doc to API 5.
Merge commit 'ca69cda6f8c4c098dbd178929322d53646215339'
* commit 'ca69cda6f8c4c098dbd178929322d53646215339':
Fix the MergeRootFrameLayout rule by checking the presence of padding.
Merge commit 'c85467672fe53721222828b458716f9f9303808d'
* commit 'c85467672fe53721222828b458716f9f9303808d':
Update AVD creation UI to be easier for skin/sdcard.