aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Fixed DeviceConfig to match change made to device schemaMichael Wright2012-06-191-2/+2
|/
* Merge "SDK: Upload SDK controller API binary."Raphael Moll2012-06-181-0/+0
|\
| * SDK: Upload SDK controller API binary.Raphael Moll2012-06-181-0/+0
* | Merge "Added device functionality to the AVD manager"Michael Wright2012-06-184-31/+217
|\ \
| * | Added device functionality to the AVD managerMichael Wright2012-06-184-31/+217
* | | Merge "Added FolderConfig creation and config loading for Devices"Michael Wright2012-06-185-11/+306
|\ \ \ | |/ /
| * | Added FolderConfig creation and config loading for DevicesMichael Wright2012-06-185-11/+306
|/ /
* | Merge "Tweak wizard title and leave target dropdown menu enabled"Tor Norbye2012-06-183-9/+42
|\ \
| * | Tweak wizard title and leave target dropdown menu enabledTor Norbye2012-06-183-9/+42
* | | Merge "Format unknown API level a bit better in the new project wizard."Xavier Ducrohet2012-06-181-1/+2
|\ \ \
| * | | Format unknown API level a bit better in the new project wizard.Xavier Ducrohet2012-06-181-1/+2
|/ / /
* | | Merge "Prevent a possible NPE when creating a project."Xavier Ducrohet2012-06-181-9/+10
|\ \ \ | |_|/ |/| |
| * | Prevent a possible NPE when creating a project.Xavier Ducrohet2012-06-181-9/+10
* | | Merge "AVD Editor: support Enum Hardware Properties."Raphael Moll2012-06-183-36/+151
|\ \ \ | |_|/ |/| |
| * | AVD Editor: support Enum Hardware Properties.Raphael Moll2012-06-183-36/+151
* | | Merge "Fix instructions from SDK Controller app"Raphael Moll2012-06-181-2/+4
|\ \ \ | |/ /
| * | Fix instructions from SDK Controller appRaphael Moll2012-06-181-2/+4
* | | Merge "Update SDK release files."Xavier Ducrohet2012-06-182-2/+2
|\ \ \ | |_|/ |/| |
| * | Update SDK release files.Xavier Ducrohet2012-06-182-2/+2
|/ /
* | Merge "Rename template file from _ prefix"Tor Norbye2012-06-187-5/+10
|\ \
| * | Rename template file from _ prefixTor Norbye2012-06-187-5/+10
| |/
* | Merge "Add lib source folders to the emma report."Xavier Ducrohet2012-06-184-7/+23
|\ \ | |/ |/|
| * Add lib source folders to the emma report.Xavier Ducrohet2012-06-154-7/+23
* | Merge "Workaround for Eclipse resource detection."Tor Norbye2012-06-183-11/+22
|\ \
| * | Workaround for Eclipse resource detection.Tor Norbye2012-06-183-11/+22
|/ /
* | Merge "Preview support in the templates"Tor Norbye2012-06-1816-349/+756
|\ \
| * | Preview support in the templatesTor Norbye2012-06-1816-349/+756
|/ /
* | Merge "Fix convert8To4, convert8To5"Raphaƫl Moll2012-06-151-2/+2
|\ \
| * | Fix convert8To4, convert8To5Jack Palevich2012-06-151-2/+2
* | | Merge changes Ife59a297,Id8db82e2Xavier Ducrohet2012-06-1519-195/+543
|\ \ \ | |/ / |/| / | |/
| * Fix issue where libraries were not getting instrumented.Xavier Ducrohet2012-06-159-154/+301
| * Fix emma for split projects.Xavier Ducrohet2012-06-1417-61/+262
* | Merge "Launcher activities are not flagged as unprotected anymore if they are...Tor Norbye2012-06-152-1/+29
|\ \
| * | Launcher activities are not flagged as unprotected anymore if they are not pr...Sebastian Porst2012-06-152-1/+29
|/ /
* | Merge "Project wizard tweaks"Tor Norbye2012-06-159-242/+108
|\ \
| * | Project wizard tweaksTor Norbye2012-06-159-242/+108
|/ /
* | Merge "SDK Manager fix display of update revisions."Raphael Moll2012-06-152-3/+3
|\ \
| * | SDK Manager fix display of update revisions.Raphael Moll2012-06-152-3/+3
* | | Merge "SDK Manager fix."Raphael Moll2012-06-157-40/+291
|\ \ \ | |/ /
| * | SDK Manager fix.Raphael Moll2012-06-157-40/+291
* | | Merge "Misc. Minor bufixes"Siva Velusamy2012-06-152-3/+3
|\ \ \
| * | | Misc. Minor bufixesSiva Velusamy2012-06-152-3/+3
* | | | Merge "Misc bugfixes"Tor Norbye2012-06-1512-49/+97
|\ \ \ \
| * | | | Misc bugfixesTor Norbye2012-06-1412-49/+97
| |/ / /
* | | | Merge "Dependency support for the templates"Tor Norbye2012-06-1517-35/+514
|\ \ \ \ | |_|/ / |/| | |
| * | | Dependency support for the templatesTor Norbye2012-06-1417-35/+514
* | | | Merge "Add format handling to the template wizards"Tor Norbye2012-06-159-31/+97
|\ \ \ \ | |/ / /
| * | | Add format handling to the template wizardsTor Norbye2012-06-149-31/+97
* | | | Merge "Update templates"Tor Norbye2012-06-1522-27/+116
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Update templatesTor Norbye2012-06-1422-27/+116