summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structu...Elliott Hughes2014-10-091-1/+1
|\
| * am ae1b6805: Merge "Track change to private libcore data structure."Elliott Hughes2014-10-091-1/+1
| |\
| | * Track change to private libcore data structure.Elliott Hughes2014-10-081-1/+1
* | | am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
|\ \ \
| * \ \ am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| |\ \ \
| | * | | Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| | * | | LayoutLib: Use ICU's line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-082-0/+56
| | * | | Resource resolution bug fix. [DO NOT MERGE]Deepanshu Gupta2014-10-011-2/+1
| | * | | Fix Tests after cherry picks. [DO NOT MERGE]Deepanshu Gupta2014-10-012-5/+5
| | * | | Update intelliJ copyright profile [DO NOT MERGE]Deepanshu Gupta2014-10-011-1/+1
| | * | | Build layoutlib create tests as part of sdk build. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+3
| | * | | Add layoutlib tests to DIST_DIR [DO NOT MERGE]Deepanshu Gupta2014-10-012-0/+6
| | * | | Build layoutlib_create tests. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+32
| | * | | Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]Deepanshu Gupta2014-10-0113-23/+75
| | * | | Get filename from File faster [DO NOT MERGE]Deepanshu Gupta2014-10-011-9/+6
| | * | | Add testing framework to LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-10-0165-26/+1965
| | * | | Add tests to the layoutlib eclipse project. [DO NOT MERGE]Deepanshu Gupta2014-10-011-1/+3
| | * | | Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| | * | | Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modula...Deepanshu Gupta2014-09-041-0/+4
| | |\ \ \
| | | * | | Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| | * | | | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| | |/ / /
* | | | | am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl...Adam Lesinski2014-10-031-20/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-devAdam Lesinski2014-10-031-20/+26
| |\ \ \ \
| | * | | | AAPT: Gate v21 resource synthesizing logging behind -v flagAdam Lesinski2014-10-031-20/+26
* | | | | | am c74a2b34: Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Minor style changes.Deepanshu Gupta2014-10-021-3/+3
* | | | | | resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-024-141/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"Neil Fuller2014-10-024-141/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Switch from FloatMath -> Math and Math.hypot where possible"Neil Fuller2014-10-024-141/+3
| | |\ \ \ \
| | | * | | | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-014-141/+3
* | | | | | | am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Frameworks/base: Fix more aapt issuesAndreas Gampe2014-10-014-30/+51
* | | | | | | resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-0113-387/+540
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings"Andreas Gampe2014-10-0114-389/+527
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Frameworks/base: Fix AAPT warningsAndreas Gampe2014-10-0114-389/+527
* | | | | | | am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-devDeepanshu Gupta2014-10-022-202/+110
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Always resolve enum when resolving resources." into lmp-devDeepanshu Gupta2014-10-022-202/+110
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Always resolve enum when resolving resources.Deepanshu Gupta2014-09-292-202/+110
* | | | | | | am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-devStephen Hines2014-10-012-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | include direct.h for _mkdirAndrew Hsieh2014-09-302-0/+4
| |/ / / / /
* | | | | | resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aospDan Albert2014-10-015-142/+22
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper."Dan Albert2014-10-015-142/+22
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Use std::sort instead of qsort_r wrapper.Dan Albert2014-10-015-142/+22
| | | |/ / | | |/| |
* | | | | am 052c4c4b: Merge "Update time in layout preview" into lmp-devDeepanshu Gupta2014-09-301-2/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update time in layout previewDeepanshu Gupta2014-09-291-2/+1
* | | | | am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh...Adam Lesinski2014-09-262-1/+19
|\ \ \ \ \ | |/ / / /
| * | | | AAPT: Fix issue with synthesized resource not actually showing upAdam Lesinski2014-09-242-1/+19
* | | | | am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...Adam Lesinski2014-09-229-36/+316
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2025-01-28 15:17:16 +0000