summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support actionProviderClass attribute for menus."Deepanshu Gupta2014-05-022-3/+26
|\
| * Support actionProviderClass attribute for menus.Deepanshu Gupta2014-05-012-3/+26
* | am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocal...Elliott Hughes2014-04-301-2/+1
|\ \ | |/ |/|
| * am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of st...Elliott Hughes2014-04-301-2/+1
| |\
| | * am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-...Elliott Hughes2014-04-301-2/+1
| | |\
| | | * Fixes issue causing pseudolocalization of stringsIgor Viarheichyk2014-04-301-2/+1
| | * | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-2918-100/+340
| | |\ \ | | | |/ | | |/|
| | | * am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| | | |\
| | | * \ resolved conflicts for merge of c76345a3 to klp-dev-plus-aospDeepanshu Gupta2014-03-122-4/+20
| | | |\ \
| | | * \ \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-111-50/+25
| | | |\ \ \
| | | * \ \ \ am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sys...David 'Digit' Turner2014-03-111-0/+2
| | | |\ \ \ \
| | | * \ \ \ \ am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."Ying Wang2014-03-111-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-03-111-5/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-03-078-224/+522
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."Narayan Kamath2014-03-072-3/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...Narayan Kamath2014-03-061-4/+4
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aospBrian Carlstrom2014-03-063-3/+3
| | | |\ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ am c046c767: am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton ...Deepanshu Gupta2014-04-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]Deepanshu Gupta2014-04-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix class name for OverflowMenuButton [DO NOT MERGE]Deepanshu Gupta2014-04-291-2/+2
| * | | | | | | | | | | | | | | am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to Over...Deepanshu Gupta2014-04-301-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [...Deepanshu Gupta2014-04-301-1/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-04-291-1/+28
| * | | | | | | | | | | | | | | am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSes...Deepanshu Gupta2014-04-241-47/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO ...Deepanshu Gupta2014-04-241-47/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-04-241-47/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fix style warnings in RenderSessionImpl [DO NOT MERGE]Deepanshu Gupta2014-04-231-47/+45
| * | | | | | | | | | | | | | | | am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib...Deepanshu Gupta2014-04-246-7/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO ...Deepanshu Gupta2014-04-246-7/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-04-246-7/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]Deepanshu Gupta2014-04-236-7/+36
| * | | | | | | | | | | | | | | | am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus....Deepanshu Gupta2014-04-246-45/+251
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-04-246-45/+251
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-04-236-45/+251
| | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Fix build [DO NOT MERGE]Deepanshu Gupta2014-04-171-1/+1
* | | | | | | | | | | | | | | | Merge "Add special system view cookie to OverflowButton."Deepanshu Gupta2014-04-291-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add special system view cookie to OverflowButton.Deepanshu Gupta2014-04-251-1/+28
* | | | | | | | | | | | | | | | | Merge "Child nodes of <preference-headers> now output proguard keep options."Adam Lesinski2014-04-251-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Child nodes of <preference-headers> now output proguard keep options.Adam Lesinski2014-04-251-7/+12
* | | | | | | | | | | | | | | | | Bug fix in layoutlibDeepanshu Gupta2014-04-232-5/+4
* | | | | | | | | | | | | | | | | Fix style warnings in RenderSessionImplDeepanshu Gupta2014-04-231-47/+45
* | | | | | | | | | | | | | | | | Add view cookies for action bar menus.Deepanshu Gupta2014-04-236-45/+251
* | | | | | | | | | | | | | | | | Merge "Update Matrix_Delegate native methods."Deepanshu Gupta2014-04-221-124/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Update Matrix_Delegate native methods.Deepanshu Gupta2014-04-211-124/+59
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am be06a418: am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."Deepanshu Gupta2014-04-221-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."Deepanshu Gupta2014-04-221-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add missing ICU_Delegate methods.Deepanshu Gupta2014-04-211-0/+10
* | | | | | | | | | | | | | | | am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recen...Elliott Hughes2014-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocal...Elliott Hughes2014-04-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Fix warning introduced by recent psuedolocalizer change.Elliott Hughes2014-04-181-1/+1