summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."Narayan Kamath2014-01-312-3/+2
| |\ \ \
| | * | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-312-3/+2
| * | | | am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...Narayan Kamath2014-01-311-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "AArch64: Use of long for pointers in PropertyValuesHolder"Narayan Kamath2014-01-301-4/+4
| | |\ \ \
| | | * | | AArch64: Use of long for pointers in PropertyValuesHolderAshok Bhat2014-01-291-4/+4
* | | | | | Fix broken build in BridgeResourcesAlan Viverette2014-02-011-0/+1
* | | | | | am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus...Narayan Kamath2014-01-311-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aospNarayan Kamath2014-01-313-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Fix a few more delegate methods in layoutlib.Narayan Kamath2014-01-293-4/+4
| | |/ /
| * | | resolved conflicts for merge of b82b2f98 to klp-dev-plus-aospNarayan Kamath2014-01-2838-344/+344
| |\ \ \ | | |/ /
| | * | Track 64bit changes to android/graphics.Narayan Kamath2014-01-2838-344/+344
| * | | am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and n...Narayan Kamath2014-01-271-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-1/+1
| * | am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
| |\ \ | | |/
| | * Merge "Don't pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
| | |\
| | | * Don't pseudolocalize untranslatable strings.Narayan Kamath2013-12-101-5/+13
| * | | am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-111-1/+2
| |\ \ \ | | |/ /
| | * | 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-2252-500/+1683
| | | |\
| * | | \ am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into ...Xavier Ducrohet2013-11-265-89/+25
| |\ \ \ \
| | * | | | Update delegate methods in layoutlib.Deepanshu Gupta2013-11-255-89/+25
| * | | | | am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" i...Deepanshu Gupta2013-11-181-2/+2
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Update ICU_Delegate methods. DO NOT MERGEDeepanshu Gupta2013-11-181-2/+2
| * | | | am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT ...Deepanshu Gupta2013-11-182-1/+7
| |\ \ \ \ | | |/ / /
| | * | | Add libphonenumber to layoutlib.jar. DO NOT MERGEDeepanshu Gupta2013-11-132-1/+7
| * | | | am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp...Deepanshu Gupta2013-11-181-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Fix NPE in layoutlib. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+0
| * | | | am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. ...Deepanshu Gupta2013-11-131-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Update changed delegate method in Bitmap_Delegate. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+2
| * | | | am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own confi...Craig Mautner2013-11-121-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Relayout windows that handle their own config change.Craig Mautner2013-11-121-1/+1
| * | | | am 76b715e5: am e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-devDeepanshu Gupta2013-11-101-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix text size in Fake Action BarDeepanshu Gupta2013-11-081-1/+1
| * | | | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-293-40/+40
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-293-40/+40
| | |\ \ \
| | | * | | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-293-40/+40
| * | | | | am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wak...Marco Nelissen2013-10-251-0/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add a method to set a list of uids for a wake lockMarco Nelissen2013-10-251-0/+5
| * | | | | am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" i...Adam Lesinski2013-10-181-1/+38
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Prune unneeded density resources from APK" into klp-devAdam Lesinski2013-10-181-1/+38
| | |\ \ \ \
| | | * | | | Prune unneeded density resources from APKAdam Lesinski2013-10-151-1/+38
| * | | | | | am 5a6541eb: am b4f33d8f: Merge "Layoutlib Create: Remove references to java ...Deepanshu Gupta2013-10-183-3/+138
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Layoutlib Create: Remove references to java package class Objects.Deepanshu Gupta2013-10-173-3/+138
| * | | | | | am ddc069cb: am 6c3a638d: Merge "Fix layoutlib for KK" into klp-devDeepanshu Gupta2013-10-174-15/+50
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix layoutlib for KK" into klp-devDeepanshu Gupta2013-10-184-15/+50
| | |\ \ \ \ \
generated by cgit v1.1 at 2025-01-07 06:03:38 +0000