aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | merge from tools_r8The Android Open Source Project2010-10-2715-12/+174
|\ \ \ | | |/ | |/|
| * | Merge "Fix resource issues in ADT." into tools_r8Xavier Ducrohet2010-10-2715-12/+174
| |\ \
| | * | Fix resource issues in ADT.Raphael2010-10-2715-12/+174
* | | | merge from tools_r8The Android Open Source Project2010-10-275-15/+272
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "ADT: Separate manifest test for AttrsXmlParser." into tools_r8Raphael Moll2010-10-275-15/+272
| |\ \ | | |/ | |/|
| | * ADT: Separate manifest test for AttrsXmlParser.Raphael Moll2010-10-275-15/+272
| |/
* | Merge "Add dictionary to codebase"Tor Norbye2010-10-278-18/+140
|\ \
| * | Add dictionary to codebaseTor Norbye2010-10-278-18/+140
* | | merge from tools_r8The Android Open Source Project2010-10-271-1/+1
|\ \ \ | | |/ | |/|
| * | Merge "ADT: Fix display of unknown Manifest elements." into tools_r8Raphael Moll2010-10-271-1/+1
| |\ \
| | * | ADT: Fix display of unknown Manifest elements.Raphael Moll2010-10-271-1/+1
| |/ /
* | | merge from tools_r8The Android Open Source Project2010-10-262-1/+16
|\ \ \ | |/ / | | / | |/ |/|
| * Merge "ADT: Exclude <include> tag from the GLE palette." into tools_r8Raphael Moll2010-10-262-1/+16
| |\
| | * ADT: Exclude <include> tag from the GLE palette.Raphael Moll2010-10-262-1/+16
| |/
* | merge from tools_r8The Android Open Source Project2010-10-264-5/+112
|\ \ | |/
| * Merge "SDK: Fixed proguard.bat & co." into tools_r8Raphael Moll2010-10-263-0/+51
| |\
| | * SDK: Fixed proguard.bat & co.Raphael Moll2010-10-263-0/+51
| * | Merge "ADT: fixes to make Proguard work under Windows." into tools_r8Raphael Moll2010-10-261-5/+61
| |\ \ | | |/
| | * ADT: fixes to make Proguard work under Windows.Raphael Moll2010-10-261-5/+61
| |/
* | Merge "Support 3rd party layout rule loading, and rip out Groovy support"Tor Norbye2010-10-2628-721/+136
|\ \
| * | Support 3rd party layout rule loading, and rip out Groovy supportTor Norbye2010-10-2628-721/+136
|/ /
* | merge from tools_r8The Android Open Source Project2010-10-252-23/+44
|\ \ | |/
| * Merge "Fix external jar support when building with proguard." into tools_r8Xavier Ducrohet2010-10-252-23/+44
| |\
| | * Fix external jar support when building with proguard.Xavier Ducrohet2010-10-252-23/+44
| |/
* | Merge "Add layout unit tests"Tor Norbye2010-10-2519-6/+1742
|\ \
| * | Add layout unit testsTor Norbye2010-10-2519-6/+1742
|/ /
* | Merge "Port layout rules to Java"Tor Norbye2010-10-2476-2032/+2678
|\ \
| * | Port layout rules to JavaTor Norbye2010-10-2276-2032/+2678
|/ /
* | merge from tools_r8The Android Open Source Project2010-10-221-1/+1
|\ \ | |/
| * Merge "Remove temporary disabling of proguard during ADT export." into tools_r8Xavier Ducrohet2010-10-221-1/+1
| |\
| | * Remove temporary disabling of proguard during ADT export.Xavier Ducrohet2010-10-221-1/+1
* | | merge from tools_r8The Android Open Source Project2010-10-211-0/+8
|\ \ \ | |/ /
| * | Merge "Workaround failure to collect test info for large test suites." into t...Xavier Ducrohet2010-10-211-0/+8
| |\ \ | | |/ | |/|
| | * Workaround failure to collect test info for large test suites.Brett Chabot2010-10-191-0/+8
* | | merge from tools_r8The Android Open Source Project2010-10-200-0/+0
|\ \ \ | |/ /
| * | Merge "Integrate 6db57208 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-2015-37/+1108
| |\ \
| | * | Integrate 6db57208 into tools_r8. DO NOT MERGE.Bill Napier2010-10-2015-37/+1108
| * | | Merge "Integrate 5397067d into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-201-1/+19
| |\ \ \ | | |/ /
| | * | Integrate 5397067d into tools_r8. DO NOT MERGE.Bill Napier2010-10-201-1/+19
| * | | Merge "Integrate 17398174 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-203-3/+30
| |\ \ \ | | |/ /
| | * | Integrate 17398174 into tools_r8. DO NOT MERGE.Bill Napier2010-10-203-3/+30
| |/ /
* | | merge from tools_r8The Android Open Source Project2010-10-201-6/+0
|\ \ \ | |/ /
| * | Merge "Gen folder should not be derived." into tools_r8Xavier Ducrohet2010-10-201-6/+0
| |\ \ | | |/ | |/|
| | * Gen folder should not be derived.Xavier Ducrohet2010-10-201-6/+0
| |/
* | Merge "Fix ddms filechooser behavior and Mac accelerator"Tor Norbye2010-10-193-6/+32
|\ \
| * | Fix ddms filechooser behavior and Mac acceleratorTor Norbye2010-10-193-6/+32
* | | merge from tools_r8The Android Open Source Project2010-10-190-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Integrate 9174add7 into tools_r8. DO NOT MERGE" into tools_r8Xavier Ducrohet2010-10-191-1/+5
| |\ \
| | * | Integrate 9174add7 into tools_r8. DO NOT MERGERaphael Moll2010-10-191-1/+5
| * | | Merge "Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-191-1/+4
| |\ \ \ | | |/ /