summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in la...Deepanshu Gupta2014-02-061-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into...Deepanshu Gupta2014-02-061-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Optimize layout rendering in layoutlib" into klp-devDeepanshu Gupta2014-02-061-2/+2
| | | |\ \ \
| | | | * | | Optimize layout rendering in layoutlibDeepanshu Gupta2014-01-201-2/+2
| | | | |/ /
* | | | | | am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files ...Deepanshu Gupta2014-02-069-31/+143
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libpho...Deepanshu Gupta2014-02-069-31/+143
| |\ \ \ \ \ | | |/ / / /
| | * | | | am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for ...Deepanshu Gupta2014-02-069-31/+143
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Add missing files to fix libphonenumber for layoutlib." into klp-devDeepanshu Gupta2014-02-069-31/+143
| | | |\ \ \
| | | | * | | Add missing files to fix libphonenumber for layoutlib.Deepanshu Gupta2014-01-179-31/+143
| | | | |/ /
* | | | | | am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measuremen...Deepanshu Gupta2014-02-063-41/+60
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bou...Deepanshu Gupta2014-02-063-41/+60
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into kl...Deepanshu Gupta2014-02-063-41/+60
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fix the measurement of text bounds." into klp-devDeepanshu Gupta2014-02-063-41/+60
| | | |\ \ \
| | | | * | | Fix the measurement of text bounds.Deepanshu Gupta2014-01-073-41/+60
| | | | |/ /
* | | | | | am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch l...Deepanshu Gupta2014-02-061-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-061-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d5129e75: am 8a892279: Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-061-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-051-2/+2
| | | |/ /
* | | | | 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
* | | | | | 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
|\ \ \ \ | |/ / /