Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lm... | Chris Warrington | 2015-02-10 | 1 | -15/+10 |
|\ | |||||
| * | Fix AAPT daemon mode with paths containg spaces. | Chris Warrington | 2015-02-09 | 1 | -15/+10 |
* | | am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 778944... | Deepanshu Gupta | 2015-01-31 | 5 | -124/+452 |
|\ \ | |/ | |||||
| * | am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev | Deepanshu Gupta | 2015-01-31 | 5 | -124/+452 |
| |\ | |||||
| | * | am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev | Deepanshu Gupta | 2015-01-31 | 5 | -124/+452 |
| | |\ | |||||
| | | * | Limited AppCompat support | Deepanshu Gupta | 2015-01-28 | 5 | -124/+452 |
* | | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683... | Deepanshu Gupta | 2015-01-31 | 2 | -8/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev | Deepanshu Gupta | 2015-01-31 | 2 | -8/+24 |
| |\ \ \ | | |/ / | |||||
| | * | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev | Deepanshu Gupta | 2015-01-31 | 2 | -8/+24 |
| | |\ \ | | | |/ | |||||
| | | * | Resource resolution fixes. | Deepanshu Gupta | 2015-01-15 | 2 | -8/+24 |
* | | | | Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 | Narayan Kamath | 2015-01-23 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Remove superfluous OpenSSL include paths. | Adam Langley | 2015-01-22 | 1 | -1/+0 |
* | | | | | Merge "AAPT: Use the right enum when checking for density configurations" int... | Adam Lesinski | 2015-01-23 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | AAPT: Use the right enum when checking for density configurations | Adam Lesinski | 2015-01-22 | 1 | -1/+1 |
* | | | | | am aee7225e: Merge "Process base APK" into lmp-mr1-dev | Adam Lesinski | 2015-01-20 | 5 | -88/+350 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Process base APK | Adam Lesinski | 2015-01-16 | 5 | -88/+350 |
* | | | | | am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute u... | Adam Lesinski | 2015-01-14 | 3 | -48/+127 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | AAPT: Handle all old unversioned attribute usage | Adam Lesinski | 2015-01-14 | 3 | -48/+127 |
* | | | | | am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387:... | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case... | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to... | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ... | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
| | | |\ \ | |||||
| | | | * \ | am 74147527: am 8505c387: Special case AppCompat to show action bar. | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
| | | | |\ \ | |||||
| | | | | * \ | am 8505c387: Special case AppCompat to show action bar. | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
| | | | | |\ \ | |||||
| | | | | | * | | Special case AppCompat to show action bar. | Deepanshu Gupta | 2015-01-10 | 1 | -13/+23 |
| | | | | * | | | am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] | Deepanshu Gupta | 2014-09-26 | 1 | -2/+7 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | * | | Fix error when using list as actionBarNavMode. [DO NOT MERGE] | Deepanshu Gupta | 2014-09-25 | 1 | -2/+7 |
| | | | | * | | | am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" in... | Deepanshu Gupta | 2014-09-04 | 1 | -0/+4 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | * | | Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev | Deepanshu Gupta | 2014-09-04 | 1 | -0/+4 |
| | | | | | |\ \ | |||||
| | | | | | | * | | Resolve color xml attributes properly. [DO NOT MERGE] | Deepanshu Gupta | 2014-08-26 | 1 | -0/+4 |
| | | | | * | | | | am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]"... | Deepanshu Gupta | 2014-09-04 | 1 | -2/+3 |
| | | | | |\ \ \ \ | | | | | | |/ / / | |||||
| | | | | | * | | | Fix "@null" resource values in LayoutLib. [DO NOT MERGE] | Deepanshu Gupta | 2014-08-26 | 1 | -2/+3 |
| | | | | | |/ / | |||||
| | | | | * | | | am 59eedf52: Layoutlib: Update wifi and battery icon for KK | Deepanshu Gupta | 2014-08-16 | 12 | -1/+1 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | * | | Layoutlib: Update wifi and battery icon for KK | Deepanshu Gupta | 2014-08-15 | 12 | -1/+1 |
| | | | * | | | | Support Locale.toLanguageTag on Java 6 | Deepanshu Gupta | 2015-01-09 | 4 | -13/+129 |
| | | | * | | | | LayoutLib: Fix System.arraycopy() | Deepanshu Gupta | 2015-01-09 | 3 | -8/+23 |
* | | | | | | | | am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0 | Adam Lesinski | 2015-01-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Fixup aapt usage message | Johan Redestig | 2015-01-07 | 1 | -1/+1 |
| * | | | | | | | Add appropriate casts for char16_t. | Dan Albert | 2014-11-20 | 1 | -2/+2 |
* | | | | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Replace java.util.LinkedHashMap.eldest() | Deepanshu Gupta | 2015-01-07 | 3 | -2/+68 |
* | | | | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Add missing DateFormat method." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Add missing DateFormat method. | Deepanshu Gupta | 2015-01-07 | 1 | -0/+5 |
* | | | | | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Update platform.dir search in tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -2/+18 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Update platform.dir search in tests. | Deepanshu Gupta | 2015-01-07 | 1 | -2/+18 |
* | | | | | | | | | am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." ... | Deepanshu Gupta | 2015-01-08 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | |