summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-a...Dan Albert2015-03-053-26/+19
|\
| * resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\
| | * Stop using namespace std.Dan Albert2015-03-043-26/+19
* | | Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."Narayan Kamath2015-02-112-1/+8
|\ \ \ | |/ / |/| |
| * | Parse res-car as resources for UI_MODE_TYPE_CAR..Narayan Kamath2015-02-102-1/+8
* | | 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
* | | 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 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 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 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" i...Adam Lesinski2014-12-162-0/+16
|\ \ \ | | |/ | |/|
| * | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-devAdam Lesinski2014-12-162-0/+16
| |\ \
| | * | AAPT: Copy android:revisionCode to SplitsAdam Lesinski2014-12-162-0/+16
* | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be...Adam Lesinski2014-12-161-25/+17
|\ \ \ \ | |/ / /
| * | | Merge "AAPT: attributes showing up after v21 attributes would be removed for ...Adam Lesinski2014-12-151-25/+17
| |\ \ \
| | * | | AAPT: attributes showing up after v21 attributes would be removed for pre-21 ...Adam Lesinski2014-12-101-25/+17
| | |/ /
* | | | am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-...Adam Lesinski2014-12-091-5/+3
|\ \ \ \ | |/ / /
| * | | AAPT: Dump status of required flag for uses-featureAdam Lesinski2014-12-081-5/+3
| |/ /
* | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-052-22/+164
|\ \ \ | |/ /
| * | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-042-22/+161
| |\ \
| | * | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-032-22/+161
* | | | am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Progu...Adam Lesinski2014-12-031-6/+9
|\ \ \ \ | |/ / /
| * | | AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
* | | | am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Progu...Adam Lesinski2014-12-031-0/+9
|\ \ \ \ | |/ / /
| * | | AAPT: Add custom transition classes to Proguard keep setAdam Lesinski2014-12-021-0/+9
| |/ /
* | | 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 da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1...Adam 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
|\ \ \ | | |/ | |/|
| * | Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
| * | 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 a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl...Adam Lesinski2014-10-031-20/+26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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 70de9c0d: Merge "include direct.h for _mkdir" into lmp-devStephen Hines2014-10-011-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aospDan Albert2014-10-015-142/+22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-07 05:57:22 +0000