Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-27 | 15 | -12/+174 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge "Fix resource issues in ADT." into tools_r8 | Xavier Ducrohet | 2010-10-27 | 15 | -12/+174 | |
| |\ \ | ||||||
| | * | | Fix resource issues in ADT. | Raphael | 2010-10-27 | 15 | -12/+174 | |
* | | | | merge from tools_r8 | The Android Open Source Project | 2010-10-27 | 5 | -15/+272 | |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | ||||||
| * | | Merge "ADT: Separate manifest test for AttrsXmlParser." into tools_r8 | Raphael Moll | 2010-10-27 | 5 | -15/+272 | |
| |\ \ | | |/ | |/| | ||||||
| | * | ADT: Separate manifest test for AttrsXmlParser. | Raphael Moll | 2010-10-27 | 5 | -15/+272 | |
| |/ | ||||||
* | | Merge "Add dictionary to codebase" | Tor Norbye | 2010-10-27 | 8 | -18/+140 | |
|\ \ | ||||||
| * | | Add dictionary to codebase | Tor Norbye | 2010-10-27 | 8 | -18/+140 | |
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-27 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge "ADT: Fix display of unknown Manifest elements." into tools_r8 | Raphael Moll | 2010-10-27 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | ADT: Fix display of unknown Manifest elements. | Raphael Moll | 2010-10-27 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-26 | 2 | -1/+16 | |
|\ \ \ | |/ / | | / | |/ |/| | ||||||
| * | Merge "ADT: Exclude <include> tag from the GLE palette." into tools_r8 | Raphael Moll | 2010-10-26 | 2 | -1/+16 | |
| |\ | ||||||
| | * | ADT: Exclude <include> tag from the GLE palette. | Raphael Moll | 2010-10-26 | 2 | -1/+16 | |
| |/ | ||||||
* | | merge from tools_r8 | The Android Open Source Project | 2010-10-26 | 4 | -5/+112 | |
|\ \ | |/ | ||||||
| * | Merge "SDK: Fixed proguard.bat & co." into tools_r8 | Raphael Moll | 2010-10-26 | 3 | -0/+51 | |
| |\ | ||||||
| | * | SDK: Fixed proguard.bat & co. | Raphael Moll | 2010-10-26 | 3 | -0/+51 | |
| * | | Merge "ADT: fixes to make Proguard work under Windows." into tools_r8 | Raphael Moll | 2010-10-26 | 1 | -5/+61 | |
| |\ \ | | |/ | ||||||
| | * | ADT: fixes to make Proguard work under Windows. | Raphael Moll | 2010-10-26 | 1 | -5/+61 | |
| |/ | ||||||
* | | Merge "Support 3rd party layout rule loading, and rip out Groovy support" | Tor Norbye | 2010-10-26 | 28 | -721/+136 | |
|\ \ | ||||||
| * | | Support 3rd party layout rule loading, and rip out Groovy support | Tor Norbye | 2010-10-26 | 28 | -721/+136 | |
|/ / | ||||||
* | | merge from tools_r8 | The Android Open Source Project | 2010-10-25 | 2 | -23/+44 | |
|\ \ | |/ | ||||||
| * | Merge "Fix external jar support when building with proguard." into tools_r8 | Xavier Ducrohet | 2010-10-25 | 2 | -23/+44 | |
| |\ | ||||||
| | * | Fix external jar support when building with proguard. | Xavier Ducrohet | 2010-10-25 | 2 | -23/+44 | |
| |/ | ||||||
* | | Merge "Add layout unit tests" | Tor Norbye | 2010-10-25 | 19 | -6/+1742 | |
|\ \ | ||||||
| * | | Add layout unit tests | Tor Norbye | 2010-10-25 | 19 | -6/+1742 | |
|/ / | ||||||
* | | Merge "Port layout rules to Java" | Tor Norbye | 2010-10-24 | 76 | -2032/+2678 | |
|\ \ | ||||||
| * | | Port layout rules to Java | Tor Norbye | 2010-10-22 | 76 | -2032/+2678 | |
|/ / | ||||||
* | | merge from tools_r8 | The Android Open Source Project | 2010-10-22 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Merge "Remove temporary disabling of proguard during ADT export." into tools_r8 | Xavier Ducrohet | 2010-10-22 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Remove temporary disabling of proguard during ADT export. | Xavier Ducrohet | 2010-10-22 | 1 | -1/+1 | |
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-21 | 1 | -0/+8 | |
|\ \ \ | |/ / | ||||||
| * | | Merge "Workaround failure to collect test info for large test suites." into t... | Xavier Ducrohet | 2010-10-21 | 1 | -0/+8 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Workaround failure to collect test info for large test suites. | Brett Chabot | 2010-10-19 | 1 | -0/+8 | |
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-20 | 0 | -0/+0 | |
|\ \ \ | |/ / | ||||||
| * | | Merge "Integrate 6db57208 into tools_r8. DO NOT MERGE." into tools_r8 | Xavier Ducrohet | 2010-10-20 | 15 | -37/+1108 | |
| |\ \ | ||||||
| | * | | Integrate 6db57208 into tools_r8. DO NOT MERGE. | Bill Napier | 2010-10-20 | 15 | -37/+1108 | |
| * | | | Merge "Integrate 5397067d into tools_r8. DO NOT MERGE." into tools_r8 | Xavier Ducrohet | 2010-10-20 | 1 | -1/+19 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Integrate 5397067d into tools_r8. DO NOT MERGE. | Bill Napier | 2010-10-20 | 1 | -1/+19 | |
| * | | | Merge "Integrate 17398174 into tools_r8. DO NOT MERGE." into tools_r8 | Xavier Ducrohet | 2010-10-20 | 3 | -3/+30 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Integrate 17398174 into tools_r8. DO NOT MERGE. | Bill Napier | 2010-10-20 | 3 | -3/+30 | |
| |/ / | ||||||
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-20 | 1 | -6/+0 | |
|\ \ \ | |/ / | ||||||
| * | | Merge "Gen folder should not be derived." into tools_r8 | Xavier Ducrohet | 2010-10-20 | 1 | -6/+0 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Gen folder should not be derived. | Xavier Ducrohet | 2010-10-20 | 1 | -6/+0 | |
| |/ | ||||||
* | | Merge "Fix ddms filechooser behavior and Mac accelerator" | Tor Norbye | 2010-10-19 | 3 | -6/+32 | |
|\ \ | ||||||
| * | | Fix ddms filechooser behavior and Mac accelerator | Tor Norbye | 2010-10-19 | 3 | -6/+32 | |
* | | | merge from tools_r8 | The Android Open Source Project | 2010-10-19 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge "Integrate 9174add7 into tools_r8. DO NOT MERGE" into tools_r8 | Xavier Ducrohet | 2010-10-19 | 1 | -1/+5 | |
| |\ \ | ||||||
| | * | | Integrate 9174add7 into tools_r8. DO NOT MERGE | Raphael Moll | 2010-10-19 | 1 | -1/+5 | |
| * | | | Merge "Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE." into tools_r8 | Xavier Ducrohet | 2010-10-19 | 1 | -1/+4 | |
| |\ \ \ | | |/ / |