summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-devJohn Spurlock2014-04-041-0/+5
|\
| * Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+5
* | am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build fi...Xavier Ducrohet2014-04-031-0/+1
|\ \ | |/ |/|
| * Add missing dependency in layoutlib build file [DO NOT MERGE]Deepanshu Gupta2014-03-311-0/+1
* | 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
* | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-072-4/+4
|/ /
* | 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 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 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 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 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 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 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 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
| | |/
* | | 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
* | | 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
generated by cgit v1.1 at 2024-05-29 11:49:48 +0000