summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am af42a91c: Fix another build breakage.Narayan Kamath2014-04-111-1/+1
|\
| * Fix another build breakage.Narayan Kamath2014-04-111-1/+1
* | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-041-0/+5
|\ \ | |/
| * 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 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layou...Xavier Ducrohet2014-04-031-0/+1
|\ \ \ | |/ /
| * | 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
* | | 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
* | | | am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
|\ \ \ \ | |/ / /
| * | | Fix layoutlib build.Narayan Kamath2014-03-141-1/+1
* | | | resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aospDeepanshu Gupta2014-03-112-4/+20
|\ \ \ \ | |/ / /
| * | | Merge "Fix the delegate method signatures in LayoutLib"Deepanshu Gupta2014-03-116-94/+46
| |\ \ \
| | * | | Fix the delegate method signatures in LayoutLibDeepanshu Gupta2014-03-056-94/+46
* | | | | 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
* | | | | 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 74bebf6f: Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-082-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-072-4/+4
| |/ / / /
* | | | | am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sys...David 'Digit' Turner2014-03-051-0/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "aidl: Support building with updated host sysroot."David 'Digit' Turner2014-03-051-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | aidl: Support building with updated host sysroot.David 'Digit' Turner2014-03-051-0/+2
* | | | | am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."Ying Wang2014-03-011-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix indirect misuse of $(my-dir).Ying Wang2014-02-281-1/+1
* | | | | am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-02-271-5/+0
|\ \ \ \ \ | |/ / / /
| * | | | Update layoutlib method for SystemClockDeepanshu Gupta2014-02-241-5/+0
| |/ / /
* | | | 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
|\ \ \ \ \ \ | |/ / / / /