aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Improve custom view search and filtering"Tor Norbye2011-05-043-15/+75
* reconcile tools_r7 into master - no actual changeThe Android Open Source Project2011-04-210-0/+0
|\
| * Merge "Add missing property expected by XML repository." into tools_r7Ralf2011-03-251-0/+2
| |\
| | * Add missing property expected by XML repository.Ralf2011-03-251-0/+2
| |/
| * Merge "Update XML schemas used for SDK Repository. Do not merge." into tools_r7Ralf2011-03-252-0/+732
| |\
| | * Update XML schemas used for SDK Repository. Do not merge.Ralf2011-03-252-0/+732
| |/
* | reconcile tools_r10 into master - no actual changeThe Android Open Source Project2011-04-210-0/+0
|\ \
| * \ Merge "SDK Manager: fix extra package update detection." into tools_r10Raphael Moll2011-04-182-16/+37
| |\ \
| | * | SDK Manager: fix extra package update detection.Raphael Moll2011-04-172-16/+37
| |/ /
| * | Merge "Fix tools_r10 build." into tools_r10David 'Digit' Turner2011-04-078-3559/+0
| |\ \
| | * | Fix tools_r10 build.David 'Digit' Turner2011-04-078-3559/+0
| |/ /
| * | Merge "This is now tools r11." into tools_r10Xavier Ducrohet2011-03-181-1/+1
| |\ \
| | * | This is now tools r11.Xavier Ducrohet2011-03-181-1/+1
| |/ /
| * | Merge "Merge ec970d641caedee9656ef8fcc7cdd60e6812b75d into tools_r10. do not ...Xavier Ducrohet2011-03-184-0/+35
| |\ \
| | * | Merge ec970d641caedee9656ef8fcc7cdd60e6812b75d into tools_r10. do not merge.David 'Digit' Turner2011-03-184-0/+35
| |/ /
| * | Merge "Merge 2daa3514 from master into tools_r10" into tools_r10Xavier Ducrohet2011-03-101-8/+9
| |\ \
| | * | Merge 2daa3514 from master into tools_r10Raphael Moll2011-03-091-8/+9
| |/ /
| * | Merge "Merge ee5c6227 from master. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-03-095-8/+10
| |\ \
| | * | Merge ee5c6227 from master. DO NOT MERGE.Xavier Ducrohet2011-03-095-8/+10
| |/ /
| * | Merge "ADT 10.0.1 - DO NOT MERGE." into tools_r10Xavier Ducrohet2011-03-0915-31/+25
| |\ \
| | * | ADT 10.0.1 - DO NOT MERGE.Xavier Ducrohet2011-03-0815-31/+25
| |/ /
* | | Merge "When possible use File.setExecutable instead of doing an exec of chmod."Xavier Ducrohet2011-04-211-3/+51
|\ \ \
| * | | When possible use File.setExecutable instead of doing an exec of chmod.Xavier Ducrohet2011-04-211-3/+51
* | | | Merge "When unarchiving install, files that need +x don't need +w too."Xavier Ducrohet2011-04-211-2/+2
|\ \ \ \ | |/ / /
| * | | When unarchiving install, files that need +x don't need +w too.Xavier Ducrohet2011-04-211-2/+2
|/ / /
* | | Merge "Enforce at most one child on ScrollViews, and add LinearLayouts"Tor Norbye2011-04-206-6/+105
|\ \ \
| * | | Enforce at most one child on ScrollViews, and add LinearLayoutsTor Norbye2011-04-206-6/+105
|/ / /
* | | Merge "Custom listview layouts"Tor Norbye2011-04-2015-13/+872
|\ \ \
| * | | Custom listview layoutsTor Norbye2011-04-2015-13/+872
|/ / /
* | | Merge "Move getParser(name) into IProjectCallback."Xavier Ducrohet2011-04-206-13/+47
|\ \ \
| * | | Move getParser(name) into IProjectCallback.Xavier Ducrohet2011-04-206-13/+47
* | | | Merge "Fix menu editor such that it works for empty files"Tor Norbye2011-04-202-26/+37
|\ \ \ \
| * | | | Fix menu editor such that it works for empty filesTor Norbye2011-04-202-26/+37
* | | | | Merge "Fix duplicate dependencies reported by SDK installer."Raphael Moll2011-04-191-8/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix duplicate dependencies reported by SDK installer.Raphael Moll2011-04-191-8/+13
|/ / / /
* | | | Merge "Make sure 'gen' folder is never derived."Xavier Ducrohet2011-04-192-4/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Make sure 'gen' folder is never derived.Xavier Ducrohet2011-04-192-4/+7
|/ / /
* | | Merge "Cache resource resolver and manifest info"Tor Norbye2011-04-186-79/+138
|\ \ \
| * | | Cache resource resolver and manifest infoTor Norbye2011-04-186-79/+138
|/ / /
* | | Merge "Suggest application and activity name in New Project wizard"Tor Norbye2011-04-181-9/+100
|\ \ \
| * | | Suggest application and activity name in New Project wizardTor Norbye2011-04-181-9/+100
* | | | Merge "Add getViewBaseline to the LayoutLibrary class."Xavier Ducrohet2011-04-181-0/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Add getViewBaseline to the LayoutLibrary class.Xavier Ducrohet2011-04-181-0/+17
* | | | Merge "Change logging API used by ITaskMonitor."Raphael Moll2011-04-1519-139/+306
|\ \ \ \
| * | | | Change logging API used by ITaskMonitor.Raphael Moll2011-04-1519-139/+306
| |/ / /
* | | | Merge "Ensure that canvas zoom is non-zero"Tor Norbye2011-04-151-1/+5
|\ \ \ \
| * | | | Ensure that canvas zoom is non-zeroTor Norbye2011-04-151-1/+5
* | | | | Merge "Make Extract Include search in all files"Tor Norbye2011-04-1522-59/+214
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make Extract Include search in all filesTor Norbye2011-04-1522-59/+214
| |/ / /
* | | | Merge "Use swtmenubar in SDK Manager 2."Raphael Moll2011-04-157-22/+142
|\ \ \ \