Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Support actionProviderClass attribute for menus." | Deepanshu Gupta | 2014-05-02 | 2 | -3/+26 |
|\ | |||||
| * | Support actionProviderClass attribute for menus. | Deepanshu Gupta | 2014-05-01 | 2 | -3/+26 |
* | | am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocal... | Elliott Hughes | 2014-04-30 | 1 | -2/+1 |
|\ \ | |/ |/| | |||||
| * | am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of st... | Elliott Hughes | 2014-04-30 | 1 | -2/+1 |
| |\ | |||||
| | * | am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-... | Elliott Hughes | 2014-04-30 | 1 | -2/+1 |
| | |\ | |||||
| | | * | Fixes issue causing pseudolocalization of strings | Igor Viarheichyk | 2014-04-30 | 1 | -2/+1 |
| | * | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD | Bill Yi | 2014-04-29 | 18 | -100/+340 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | am c0232642: am 629daddd: Merge "Fix layoutlib build." | Narayan Kamath | 2014-03-14 | 1 | -1/+1 |
| | | |\ | |||||
| | | * \ | resolved conflicts for merge of c76345a3 to klp-dev-plus-aosp | Deepanshu Gupta | 2014-03-12 | 2 | -4/+20 |
| | | |\ \ | |||||
| | | * \ \ | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." | Narayan Kamath | 2014-03-11 | 1 | -50/+25 |
| | | |\ \ \ | |||||
| | | * \ \ \ | am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sys... | David 'Digit' Turner | 2014-03-11 | 1 | -0/+2 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." | Ying Wang | 2014-03-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" | Xavier Ducrohet | 2014-03-11 | 1 | -5/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." | Narayan Kamath | 2014-03-07 | 8 | -224/+522 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." | Narayan Kamath | 2014-03-07 | 2 | -3/+2 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert... | Narayan Kamath | 2014-03-06 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aosp | Brian Carlstrom | 2014-03-06 | 3 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ \ \ \ \ | am c046c767: am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton ... | Deepanshu Gupta | 2014-04-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE] | Deepanshu Gupta | 2014-04-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Fix class name for OverflowMenuButton [DO NOT MERGE] | Deepanshu Gupta | 2014-04-29 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to Over... | Deepanshu Gupta | 2014-04-30 | 1 | -1/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [... | Deepanshu Gupta | 2014-04-30 | 1 | -1/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Add special system view cookie to OverflowButton. [DO NOT MERGE] | Deepanshu Gupta | 2014-04-29 | 1 | -1/+28 |
| * | | | | | | | | | | | | | | | am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSes... | Deepanshu Gupta | 2014-04-24 | 1 | -47/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO ... | Deepanshu Gupta | 2014-04-24 | 1 | -47/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev | Deepanshu Gupta | 2014-04-24 | 1 | -47/+45 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | Fix style warnings in RenderSessionImpl [DO NOT MERGE] | Deepanshu Gupta | 2014-04-23 | 1 | -47/+45 |
| * | | | | | | | | | | | | | | | | am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib... | Deepanshu Gupta | 2014-04-24 | 6 | -7/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO ... | Deepanshu Gupta | 2014-04-24 | 6 | -7/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev | Deepanshu Gupta | 2014-04-24 | 6 | -7/+36 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] | Deepanshu Gupta | 2014-04-23 | 6 | -7/+36 |
| * | | | | | | | | | | | | | | | | am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus.... | Deepanshu Gupta | 2014-04-24 | 6 | -45/+251 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-04-24 | 6 | -45/+251 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-04-23 | 6 | -45/+251 |
| | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Fix build [DO NOT MERGE] | Deepanshu Gupta | 2014-04-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge "Add special system view cookie to OverflowButton." | Deepanshu Gupta | 2014-04-29 | 1 | -1/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Add special system view cookie to OverflowButton. | Deepanshu Gupta | 2014-04-25 | 1 | -1/+28 |
* | | | | | | | | | | | | | | | | | Merge "Child nodes of <preference-headers> now output proguard keep options." | Adam Lesinski | 2014-04-25 | 1 | -7/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Child nodes of <preference-headers> now output proguard keep options. | Adam Lesinski | 2014-04-25 | 1 | -7/+12 |
* | | | | | | | | | | | | | | | | | Bug fix in layoutlib | Deepanshu Gupta | 2014-04-23 | 2 | -5/+4 |
* | | | | | | | | | | | | | | | | | Fix style warnings in RenderSessionImpl | Deepanshu Gupta | 2014-04-23 | 1 | -47/+45 |
* | | | | | | | | | | | | | | | | | Add view cookies for action bar menus. | Deepanshu Gupta | 2014-04-23 | 6 | -45/+251 |
* | | | | | | | | | | | | | | | | | Merge "Update Matrix_Delegate native methods." | Deepanshu Gupta | 2014-04-22 | 1 | -124/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Update Matrix_Delegate native methods. | Deepanshu Gupta | 2014-04-21 | 1 | -124/+59 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | am be06a418: am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods." | Deepanshu Gupta | 2014-04-22 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods." | Deepanshu Gupta | 2014-04-22 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add missing ICU_Delegate methods. | Deepanshu Gupta | 2014-04-21 | 1 | -0/+10 |
* | | | | | | | | | | | | | | | | am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recen... | Elliott Hughes | 2014-04-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocal... | Elliott Hughes | 2014-04-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Fix warning introduced by recent psuedolocalizer change. | Elliott Hughes | 2014-04-18 | 1 | -1/+1 |