summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocal...Elliott Hughes2014-04-301-2/+1
|\
| * am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of st...Elliott Hughes2014-04-301-2/+1
| |\
| | * Fixes issue causing pseudolocalization of stringsIgor Viarheichyk2014-04-301-2/+1
* | | Child nodes of <preference-headers> now output proguard keep options.Adam Lesinski2014-04-251-7/+12
* | | am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recen...Elliott Hughes2014-04-181-1/+1
|\ \ \ | |/ /
| * | am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocal...Elliott Hughes2014-04-181-1/+1
| |\ \ | | |/
| | * Fix warning introduced by recent psuedolocalizer change.Elliott Hughes2014-04-181-1/+1
* | | resolved conflicts for merge of 56ca8219 to masterElliott Hughes2014-04-189-104/+335
|\ \ \ | |/ /
| * | resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aospElliott Hughes2014-04-189-104/+335
| |\ \ | | |/
| | * Pseudolocalizer improvements.Anton Krumin2014-04-099-105/+336
* | | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifi...John Spurlock2014-04-041-0/+5
|\ \ \ | |/ /
| * | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-041-0/+5
| |\ \
| | * | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+5
| * | | am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-274-92/+98
| |\ \ \ | | | |/ | | |/|
| | * | Reduce warning verbosity in aaptAdam Lesinski2014-03-244-92/+98
* | | | Shared library resource supportAdam Lesinski2014-03-259-19/+95
* | | | Reduce warning verbosity in aaptAdam Lesinski2014-03-204-92/+98
* | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-52/+28
|\ \ \ \ | |/ / /
| * | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-101-50/+25
| |\ \ \ | | |/ /
| | * | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-50/+25
* | | | resolved conflicts for merge of a81ee86b to masterTim Kilbourn2014-03-071-9/+34
|\ \ \ \ | |/ / /
| * | | am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modula...Tim Kilbourn2014-03-081-8/+32
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Dump leanback info in aapt dump badging." into klp-modular-devTim Kilbourn2014-03-081-8/+32
| | |\ \
| | | * | Dump leanback info in aapt dump badging.Tim Kilbourn2014-03-071-8/+32
* | | | | am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PD...Ying Wang2014-03-081-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 74bebf6f: Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-081-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-071-2/+2
| | |/ /
| * | | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-178-224/+522
| |\ \ \ | | | |/ | | |/|
| | * | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-148-224/+522
* | | | Add --replace-version flag to aapt.Jeff Davidson2014-02-253-11/+45
* | | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-108-224/+522
* | | | resolved conflicts for merge of 1b5b60d6 to masterAdam Lesinski2014-02-045-26/+38
|\ \ \ \ | |/ / /
| * | | am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modula...Adam Lesinski2014-02-045-25/+38
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge "Add support for multiple asset dirs (-A)" into klp-modular-devAdam Lesinski2014-02-045-25/+38
| | |\
| | | * Add support for multiple asset dirs (-A)Adam Lesinski2014-01-235-25/+38
| * | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-312-3/+2
| |/ /
| * | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-1/+1
| |/
| * Merge "Don't pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
| |\
| | * Don't pseudolocalize untranslatable strings.Narayan Kamath2013-12-101-5/+13
| * | Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-111-1/+2
| |\ \
| | * | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-1/+2
| | |/
| | * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2215-67/+972
| | |\
| * | \ am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-292-33/+32
| |\ \ \ | | |/ /
| | * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-292-33/+32
| * | | am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" i...Adam Lesinski2013-10-181-1/+38
| |\ \ \ | | |_|/ | |/| |
| | * | Prune unneeded density resources from APKAdam Lesinski2013-10-151-1/+38
| * | | am ea4e0751: am c884fc9f: Merge "AAPT emits error for res with no \'default\'...Adam Lesinski2013-10-071-4/+65
| |\ \ \ | | |/ /
| | * | AAPT emits error for res with no 'default' productAdam Lesinski2013-10-041-4/+65
| * | | am 0c923b7c: Merge "Add badging of Payment apps" into klp-devAdam Lesinski2013-09-301-11/+142
| |\ \ \ | | |/ /
| | * | Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
generated by cgit v1.1 at 2025-02-09 12:51:27 +0000