aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge "41154: Handle allowBackup properly for target < 4"Tor Norbye2012-12-103-3/+17
|\ \ \ \
| * | | | 41154: Handle allowBackup properly for target < 4Tor Norbye2012-12-103-3/+17
* | | | | Merge "Unit test fix: make tests more resilient to test jar location"Tor Norbye2012-12-102-11/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Unit test fix: make tests more resilient to test jar locationTor Norbye2012-12-102-11/+16
| | |_|/ | |/| |
* | | | Merge "gltrace: Refresh tree view in a separate task."Siva Velusamy2012-12-102-32/+106
|\ \ \ \ | |/ / / |/| | |
| * | | gltrace: Refresh tree view in a separate task.Siva Velusamy2012-12-072-32/+106
| | |/ | |/|
* | | Merge "Move lint unit tests into lint/cli"Tor Norbye2012-12-07540-18/+18
|\ \ \ | |_|/ |/| |
| * | Move lint unit tests into lint/cliTor Norbye2012-12-07540-18/+18
|/ /
* | Merge "Add simple XML dump method"Xavier Ducrohet2012-12-074-3/+198
|\ \
| * | Add simple XML dump methodTor Norbye2012-12-074-3/+198
|/ /
* | Merge changes If78ff744,I5c059cc6,Ie7fba967,Iac1bcbea,Id1409ec4,Ibcee26e6,I34...Xavier Ducrohet2012-12-071124-453/+168
|\ \ | |/ |/|
| * Refactor testutils folder structure.Xavier Ducrohet2012-12-069-57/+26
| * Refactor lint folder structure.Xavier Ducrohet2012-12-06674-88/+34
| * Fix eclipse projects from previous refactoring.Xavier Ducrohet2012-12-063-2/+4
| * Refactor manifestmerger folder structure.Xavier Ducrohet2012-12-0651-48/+18
| * Refactor ddmlib folder structure.Xavier Ducrohet2012-12-0673-49/+19
| * Refactor sdklib folder structure.Xavier Ducrohet2012-12-06208-50/+18
| * Refactor dvlib folder structure.Xavier Ducrohet2012-12-0620-54/+19
| * refactor layoutlib_api folder structure.Xavier Ducrohet2012-12-0657-50/+16
| * Refactor common lib folder structure.Xavier Ducrohet2012-12-0631-55/+14
|/
* Merge "monitor: Prefer using bundled SDK rather than lastSdk"Siva Velusamy2012-12-061-13/+17
|\
| * monitor: Prefer using bundled SDK rather than lastSdkSiva Velusamy2012-12-061-13/+17
* | Merge "Findbugs cleanup"Tor Norbye2012-12-0612-23/+36
|\ \ | |/ |/|
| * Findbugs cleanupTor Norbye2012-12-0612-23/+36
* | Merge "Add sysinfo panel to monitor/ADT"Siva Velusamy2012-12-064-0/+40
|\ \
| * | Add sysinfo panel to monitor/ADTSiva Velusamy2012-12-064-0/+40
* | | Merge "Automatically enable graphics profiling if necessary"Siva Velusamy2012-12-061-0/+54
|\ \ \ | |/ / | | / | |/ |/|
| * Automatically enable graphics profiling if necessarySiva Velusamy2012-12-061-0/+54
* | Merge "Support layout aliases properly"Tor Norbye2012-12-0613-120/+240
|\ \
| * | Support layout aliases properlyTor Norbye2012-12-0613-120/+240
| |/
* | Merge "Fix gradle build of sdk libs by adding testutils."Xavier Ducrohet2012-12-065-2/+29
|\ \ | |/ |/|
| * Fix gradle build of sdk libs by adding testutils.Xavier Ducrohet2012-12-065-2/+29
* | Merge "Filter out non-launcher activity from new project activity list"Tor Norbye2012-12-062-8/+30
|\ \
| * | Filter out non-launcher activity from new project activity listTor Norbye2012-12-052-8/+30
* | | Merge "ddms sysinfo: Add support for gfxinfo"Siva Velusamy2012-12-063-7/+221
|\ \ \ | |/ / |/| |
| * | ddms sysinfo: Add support for gfxinfoSiva Velusamy2012-12-063-7/+221
* | | Merge "Fix Ant help output."Xavier Ducrohet2012-12-051-3/+2
|\ \ \ | |_|/ |/| |
| * | Fix Ant help output.Xavier Ducrohet2012-12-051-3/+2
|/ /
* | Merge "Grid Layout tweaks"Tor Norbye2012-12-055-33/+204
|\ \
| * | Grid Layout tweaksTor Norbye2012-12-045-33/+204
* | | Merge "Add namespace elements from code completion lazily"Tor Norbye2012-12-056-25/+126
|\ \ \
| * | | Add namespace elements from code completion lazilyTor Norbye2012-12-046-25/+126
* | | | Merge "Code completion improvements for custom views and themes"Tor Norbye2012-12-0538-52/+680
|\ \ \ \ | |/ / /
| * | | Code completion improvements for custom views and themesTor Norbye2012-12-0438-52/+680
* | | | Merge "Add flag to disable dex merging."Xavier Ducrohet2012-12-056-9/+29
|\ \ \ \
| * | | | Add flag to disable dex merging.Xavier Ducrohet2012-12-056-9/+29
* | | | | Merge "sysinfo: Remove unsupported views."Siva Velusamy2012-12-051-68/+42
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | sysinfo: Remove unsupported views.Siva Velusamy2012-12-051-68/+42
| |/ /
* | | Merge "Support package conflicts between app and libs."Xavier Ducrohet2012-12-053-32/+210
|\ \ \
| * | | Support package conflicts between app and libs.Xavier Ducrohet2012-12-053-32/+210
| |/ /