summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for style...Deepanshu Gupta2014-11-211-10/+1
|\
| * am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-211-10/+1
| |\
| | * am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-191-10/+1
| | |\
| | | * Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-191-10/+1
| | | |\
| | | | * Fix setTextAppearance for styles with dots.Deepanshu Gupta2014-11-181-10/+1
| | * | | am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-devDeepanshu Gupta2014-11-192-0/+45
| | |\ \ \ | | | |/ /
| | | * | LayoutLib: Stub AM/PM keycodes in Time Picker.Deepanshu Gupta2014-11-182-0/+45
* | | | | am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process...Dianne Hackborn2014-11-212-1/+14
|\ \ \ \ \ | |/ / / /
| * | | | Fix issue with call backs from media process.Dianne Hackborn2014-11-192-1/+14
* | | | | am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-131-2/+2
|\ \ \ \ \
| * | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2
* | | | | | resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aospDan Albert2014-11-121-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
* | | | | | am 32f7a6d8: Merge "Move device admin max screen off timeout to internal inte...Jeff Brown2014-11-121-5/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Move device admin max screen off timeout to internal interface." into ...Jeff Brown2014-11-111-5/+0
| |\ \ \ \ \
| | * | | | | Move device admin max screen off timeout to internal interface.Jeff Brown2014-11-061-5/+0
* | | | | | | am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1...Adam Lesinski2014-11-111-0/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-devAdam Lesinski2014-11-111-0/+7
| |\ \ \ \ \ \
| | * | | | | | AAPT: Ignore densities specified in -c flagAdam Lesinski2014-11-101-0/+7
* | | | | | | | am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ...Adam Lesinski2014-11-111-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "Fixing NULL pointer access causing segmentation fault in aapt"Adam Lesinski2014-11-111-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
* | | | | | | | | am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object anim...Deepanshu Gupta2014-11-112-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into l...Deepanshu Gupta2014-11-112-1/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-devDeepanshu Gupta2014-11-112-1/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Don't skip loading object animator.Deepanshu Gupta2014-11-112-1/+2
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: ...Adam Lesinski2014-11-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | split-select: fix OSX buildAdam Lesinski2014-11-103-6/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am 1521303f: Merge "kill OS_CASE_SENSITIVE"Yabin Cui2014-11-111-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | kill OS_CASE_SENSITIVEYabin Cui2014-11-101-1/+2
| | |_|_|/ / | |/| | | |
| * | | | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ...Adam Lesinski2014-10-201-1/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ...Adam Lesinski2014-10-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am f47f8855: Merge "Added a daemon mode to aapt to receive streams of command...Jerome Dochez2014-10-104-0/+40
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structu...Elliott Hughes2014-10-091-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl...Adam Lesinski2014-10-031-20/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am c74a2b34: Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-024-141/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-0113-387/+540
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-devDeepanshu Gupta2014-10-022-202/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-devStephen Hines2014-10-012-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aospDan Albert2014-10-015-142/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 052c4c4b: Merge "Update time in layout preview" into lmp-devDeepanshu Gupta2014-09-301-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh...Adam Lesinski2014-09-262-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...Adam Lesinski2014-09-229-36/+316
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-193-3/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-devDeepanshu Gupta2014-09-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-13 15:13:10 +0000