summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text s...Xavier Ducrohet2014-02-201-0/+3
|\
| * am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layou...Xavier Ducrohet2014-02-201-0/+3
| |\
| | * am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMA...Xavier Ducrohet2014-02-201-0/+3
| | |\
| | | * Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp...Xavier Ducrohet2014-02-201-0/+3
| | | |\
| | | | * Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-02-191-0/+3
* | | | | am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and s...Deepanshu Gupta2014-02-201-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-lig...Deepanshu Gupta2014-02-201-3/+5
| |\ \ \ \ | | |/ / /
| | * | | am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in l...Deepanshu Gupta2014-02-201-3/+5
| | |\ \ \ | | | |/ /
| | | * | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-02-191-3/+5
| | | |/
* | | | 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
* | | | | am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering an...Deepanshu Gupta2014-02-101-40/+45
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Improve text rendering and measurement.Deepanshu Gupta2014-02-061-40/+45
* | | | | am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Ti...Deepanshu Gupta2014-02-062-3/+102
|\ \ \ \ \ | |/ / / /
| * | | | am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" ...Deepanshu Gupta2014-02-062-3/+102
| |\ \ \ \ | | |/ / /
| | * | | am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-devDeepanshu Gupta2014-02-062-3/+102
| | |\ \ \ | | | |/ /
| | | * | Merge "Add methods for Time_Delegate" into klp-devDeepanshu Gupta2014-02-062-3/+102
| | | |\ \
| | | | * | Add methods for Time_DelegateDeepanshu Gupta2014-01-312-3/+102
* | | | | | am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout re...Deepanshu Gupta2014-02-061-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
|\ \ \ \ | |/ / /