aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update compiler flags.Tor Norbye2012-10-2635-67/+154
* Merge "Close file streams used by parsers (and add guava to sdkcommon)"Tor Norbye2012-10-2513-59/+86
|\
| * Close file streams used by parsers (and add guava to sdkcommon)Tor Norbye2012-10-2513-59/+86
* | Merge "Add jobb to the SDK."Xavier Ducrohet2012-10-252-0/+6
|\ \
| * | Add jobb to the SDK.Xavier Ducrohet2012-10-252-0/+6
| |/
* | Merge "Client-side jobb (obb-creation) tool."Xavier Ducrohet2012-10-2514-0/+2834
|\ \ | |/ |/|
| * Client-side jobb (obb-creation) tool.Dan Galpin2012-10-2414-0/+2834
* | Merge "Avoid inlining the package prefix when adding activities"Tor Norbye2012-10-256-3/+268
|\ \
| * | Avoid inlining the package prefix when adding activitiesTor Norbye2012-10-256-3/+268
|/ /
* | Merge "Lint fixes for FullscreenActivity and NewAndroidApplication templates."Roman Nurik2012-10-254-6/+6
|\ \
| * | Lint fixes for FullscreenActivity and NewAndroidApplication templates.Roman Nurik2012-10-254-6/+6
|/ /
* | Merge "38920: Fix dropdown navigation template"Tor Norbye2012-10-251-4/+4
|\ \
| * | 38920: Fix dropdown navigation templateTor Norbye2012-10-251-4/+4
* | | Merge "Remove extraneous '=' from template."Siva Velusamy2012-10-251-1/+1
|\ \ \
| * | | Remove extraneous '=' from template.Siva Velusamy2012-10-251-1/+1
|/ / /
* | | Merge "emma: XML and text reports as well"Xavier Ducrohet2012-10-241-2/+4
|\ \ \
| * | | emma: XML and text reports as wellKenny Root2012-10-241-2/+4
* | | | Merge "emma: set HTML encoding to UTF-8"Xavier Ducrohet2012-10-241-0/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | emma: set HTML encoding to UTF-8Kenny Root2012-10-241-0/+1
|/ /
* | Merge "Guard against a possible NPE."Xavier Ducrohet2012-10-241-1/+4
|\ \
| * | Guard against a possible NPE.Xavier Ducrohet2012-10-241-1/+4
* | | Merge "One more device menu tweak"Raphaël Moll2012-10-241-2/+4
|\ \ \
| * | | One more device menu tweakTor Norbye2012-10-241-2/+4
* | | | Merge "Clean up new avd dialog, unify with layout manager device menu"Tor Norbye2012-10-242-124/+257
|\ \ \ \ | |/ / /
| * | | Clean up new avd dialog, unify with layout manager device menuTor Norbye2012-10-242-124/+257
* | | | Merge changes I55df8912,I342eb22aRaphaël Moll2012-10-246-26/+271
|\ \ \ \
| * | | | adtpackage: Update welcome page contentsSiva Velusamy2012-10-244-25/+269
| * | | | adt package: Add .ico fileSiva Velusamy2012-10-242-1/+2
|/ / / /
* | | | Merge "Make welcome wizard a tiny bit configurable."Siva Velusamy2012-10-242-46/+58
|\ \ \ \
| * | | | Make welcome wizard a tiny bit configurable.Siva Velusamy2012-10-242-46/+58
| |/ / /
* | | | Merge "ADT IDE: Fix eclipse launcher icon on MacOS"Siva Velusamy2012-10-241-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | ADT IDE: Fix eclipse launcher icon on MacOSRaphael Moll2012-10-241-1/+2
|/ / /
* | | Merge "Adjust SDK plugin prop: tools 21 requires ADT 21."Raphael Moll2012-10-231-1/+1
|\ \ \
| * | | Adjust SDK plugin prop: tools 21 requires ADT 21.Raphael Moll2012-10-231-1/+1
|/ / /
* | | Merge "Tools 21 depends on Platform-Tools 15 rc9."Raphael Moll2012-10-231-1/+1
|\ \ \
| * | | Tools 21 depends on Platform-Tools 15 rc9.Raphael Moll2012-10-231-1/+1
* | | | Merge "Delete emma files after getting them off of the device."Xavier Ducrohet2012-10-231-1/+9
|\ \ \ \
| * | | | Delete emma files after getting them off of the device.Xavier Ducrohet2012-10-231-1/+9
| | |/ / | |/| |
* | | | Merge "Start parsing SDK after the workbench is loaded."Siva Velusamy2012-10-233-35/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Start parsing SDK after the workbench is loaded.Siva Velusamy2012-10-233-35/+35
* | | | Merge "Set the permission of the emma file before downloading it."Xavier Ducrohet2012-10-233-4/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Set the permission of the emma file before downloading it.Xavier Ducrohet2012-10-233-4/+32
* | | | Merge "adtpackage: make adtpackage depend on, not include features"Siva Velusamy2012-10-235-61/+78
|\ \ \ \
| * | | | adtpackage: make adtpackage depend on, not include featuresSiva Velusamy2012-10-235-61/+78
| | |/ / | |/| |
* | | | Merge "Prevent potential NPE"Xavier Ducrohet2012-10-231-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Prevent potential NPETor Norbye2012-10-231-1/+2
* | | | Merge "Document the hacks to generate the IDE."Siva Velusamy2012-10-231-0/+15
|\ \ \ \
| * | | | Document the hacks to generate the IDE.Siva Velusamy2012-10-231-0/+15
|/ / / /
* | | | Merge "Eclipse Android MacOS fixes."Raphael Moll2012-10-231-2/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Eclipse Android MacOS fixes.Raphael Moll2012-10-231-2/+11