summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix theme/style resolution in Layoutlib"Deepanshu Gupta2014-04-074-14/+145
|\
| * Fix theme/style resolution in LayoutlibDeepanshu Gupta2014-04-044-14/+145
* | Fix sdk buildDeepanshu Gupta2014-04-041-0/+5
* | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifi...John Spurlock2014-04-041-0/+5
|\ \
| * \ 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
* | | | | | Add stub getThemeAttributeId() to BridgeTypedArrayDeepanshu Gupta2014-04-011-8/+15
| |_|_|_|/ |/| | | |
* | | | | Merge "Fix visitFieldInsn in layoutlib_create."Deepanshu Gupta2014-04-016-7/+36
|\ \ \ \ \
| * | | | | Fix visitFieldInsn in layoutlib_create.Deepanshu Gupta2014-03-316-7/+36
* | | | | | Add missing dependency in layoutlib build fileDeepanshu Gupta2014-03-311-0/+1
|/ / / / /
* | | | | Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-271-56/+8
* | | | | Shared library resource supportAdam Lesinski2014-03-259-19/+95
* | | | | Fix build.Dianne Hackborn2014-03-241-1/+1
* | | | | Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-214-92/+98
|\ \ \ \ \
| * | | | | Reduce warning verbosity in aaptAdam Lesinski2014-03-204-92/+98
* | | | | | Fixing yet another build breackageSvetoslav2014-03-201-36/+0
|/ / / / /
* | | | | Merge "Add native method delegates to layoutlib"Deepanshu Gupta2014-03-142-0/+13
|\ \ \ \ \
| * | | | | Add native method delegates to layoutlibDeepanshu Gupta2014-03-142-0/+13
* | | | | | am 1abb7e0f: am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 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
* | | | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-52/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | resolved conflicts for merge of a81ee86b to masterTim Kilbourn2014-03-071-9/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PD...Ying Wang2014-03-082-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support buil...David 'Digit' Turner2014-03-061-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misus...Ying Wang2014-03-011-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib m...Xavier Ducrohet2014-02-271-5/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |/ / /