summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lm...Chris Warrington2015-02-101-15/+10
|\
| * Fix AAPT daemon mode with paths containg spaces.Chris Warrington2015-02-091-15/+10
* | am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 778944...Deepanshu Gupta2015-01-315-124/+452
|\ \ | |/
| * 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-dev automerge: 7e683...Deepanshu Gupta2015-01-312-8/+24
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge "Remove superfluous OpenSSL include paths." automerge: fe24754Narayan Kamath2015-01-231-1/+0
|\ \ \ \
| * | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
* | | | | Merge "AAPT: Use the right enum when checking for density configurations" int...Adam Lesinski2015-01-231-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | AAPT: Use the right enum when checking for density configurationsAdam Lesinski2015-01-221-1/+1
* | | | | am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-205-88/+350
|\ \ \ \ \ | |/ / / /
| * | | | Process base APKAdam Lesinski2015-01-165-88/+350
* | | | | am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute u...Adam Lesinski2015-01-143-48/+127
|\ \ \ \ \ | |/ / / /
| * | | | AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
* | | | | am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387:...Deepanshu Gupta2015-01-101-13/+23
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | | | am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0Adam Lesinski2015-01-081-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fixup aapt usage messageJohan Redestig2015-01-071-1/+1
| * | | | | | | Add appropriate casts for char16_t.Dan Albert2014-11-201-2/+2
* | | | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
* | | | | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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 a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." ...Deepanshu Gupta2015-01-081-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |