summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included la...Deepanshu Gupta2015-02-231-1/+1
|\
| * am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into ...Deepanshu Gupta2015-02-231-1/+1
| |\
| | * Set forceFramework correctly for included layouts.Deepanshu Gupta2015-02-231-1/+1
* | | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-174-20/+126
|\ \ \ | |/ /
| * | am ad879adb: Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-134-20/+126
| |\ \ | | |/
| | * Merge "Add Asset management support for fonts." into lmp-devDeepanshu Gupta2015-02-134-20/+126
| | |\
| | | * Add Asset management support for fonts.Deepanshu Gupta2015-02-034-20/+126
* | | | am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp...Diego Perez2015-02-171-2/+7
|\ \ \ \ | |/ / /
| * | | am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp...Diego Perez2015-02-131-2/+7
| |\ \ \ | | |/ /
| | * | Merge "Do not paint shadow if outside of the clip area" into lmp-devDiego Perez2015-02-131-2/+7
| | |\ \
| | | * | Do not paint shadow if outside of the clip areaDiego Perez2015-02-041-2/+7
* | | | | am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-devDeepanshu Gupta2015-02-172-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-devDeepanshu Gupta2015-02-132-3/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Changes made by intelliJ 14.1" into lmp-devDeepanshu Gupta2015-02-132-3/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Changes made by intelliJ 14.1Deepanshu Gupta2015-02-042-3/+4
| | | |/
* | | | Fix AAPT daemon mode with paths containg spaces.Chris Warrington2015-02-091-15/+10
* | | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
|\ \ \ \ | |/ / /
| * | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| |\ \ \ | | |/ /
| | * | Limited AppCompat supportDeepanshu Gupta2015-01-285-124/+452
* | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
|\ \ \ \ | |/ / /
| * | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| |\ \ \ | | |/ /
| | * | Resource resolution fixes.Deepanshu Gupta2015-01-152-8/+24
| | |/
* | | AAPT: Use the right enum when checking for density configurationsAdam Lesinski2015-01-221-1/+1
* | | Process base APKAdam Lesinski2015-01-165-88/+350
* | | AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
* | | am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case...Deepanshu Gupta2015-01-101-13/+23
|\ \ \ | |/ /
| * | am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to...Deepanshu Gupta2015-01-101-13/+23
| |\ \ | | |/
| | * am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ...Deepanshu Gupta2015-01-101-13/+23
| | |\
| | | * am 74147527: am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | |\
| | | | * am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | |\
| | | | | * Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | * | am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-261-2/+7
| | | | |\ \ | | | | | |/
| | | | | * Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| | | | * | am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" in...Deepanshu Gupta2014-09-041-0/+4
| | | | |\ \ | | | | | |/
| | | | | * Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-09-041-0/+4
| | | | | |\
| | | | | | * Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| | | | * | | am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]"...Deepanshu Gupta2014-09-041-2/+3
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| | | | | |/
| | | | * | am 59eedf52: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| | | | |\ \ | | | | | |/
| | | | | * Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1512-1/+1
| | | * | | Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-094-13/+129
| | | * | | LayoutLib: Fix System.arraycopy()Deepanshu Gupta2015-01-093-8/+23
* | | | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \
| * | | | | | Replace java.util.LinkedHashMap.eldest()Deepanshu Gupta2015-01-073-2/+68
* | | | | | | Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
* | | | | | | Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update platform.dir search in tests.Deepanshu Gupta2015-01-071-2/+18
* | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| |\ \ \ \ \ | | |/ / / /