Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -1/+1 |
|\ | |||||
| * | am 6099fd21: Merge "Fix build." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix build. | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
* | | | Merge "Add a script to rename fonts for SDK." | Deepanshu Gupta | 2014-05-16 | 4 | -0/+174 |
|\ \ \ | |||||
| * | | | Add a script to rename fonts for SDK. | Deepanshu Gupta | 2014-05-16 | 4 | -0/+174 |
* | | | | Merge "Variant of sendBroadcast with appOp flag for cross-user." | Amith Yamasani | 2014-05-16 | 1 | -0/+8 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Variant of sendBroadcast with appOp flag for cross-user. | Amith Yamasani | 2014-05-16 | 1 | -0/+8 |
* | | | | Merge "LayoutLib: Correctly resolve ?attr/foo" | Deepanshu Gupta | 2014-05-16 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | LayoutLib: Correctly resolve ?attr/foo | Deepanshu Gupta | 2014-05-15 | 1 | -1/+1 |
* | | | | Layoutlib: Update delegates for L | Deepanshu Gupta | 2014-05-15 | 5 | -29/+32 |
|/ / / | |||||
* | | | am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e:... | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b:... | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721:... | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
| | |\ | |||||
| | | * | am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a:... | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d:... | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
| | | | |\ | |||||
| | | | | * | am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build | Deepanshu Gupta | 2014-05-14 | 1 | -1/+0 |
| | | | | |\ | |||||
| | | | | | * | am f266873c: am 1c55797d: Fix build | Deepanshu Gupta | 2014-05-13 | 1 | -1/+0 |
| | | | | | |\ | |||||
| | | | | | | * | am 1c55797d: Fix build | Deepanshu Gupta | 2014-05-13 | 1 | -1/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | Fix build | Deepanshu Gupta | 2014-05-13 | 1 | -1/+0 |
| | | | | | | * | | am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correct... | Deepanshu Gupta | 2014-05-13 | 1 | -1/+1 |
| | | | | | | |\ \ | | | | | | | | |/ | |||||
| | | | | | | | * | am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-d... | Deepanshu Gupta | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp | Deepanshu Gupta | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | resolve conflicts for merge 5a7b3b65 correctly | Deepanshu Gupta | 2014-05-12 | 1 | -1/+1 |
* | | | | | | | | | | | am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a:... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509:... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3:... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a:... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce:... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved con... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | |||||
| | | | | | * | | | | | am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | resolved conflicts for merge of 7377c7be to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | |||||
| | | | | | | | | * | | am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 2 | -6/+8 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * | | Add Navigation Bar to BridgeWindowManager [DO NOT MERGE] | Deepanshu Gupta | 2014-05-07 | 2 | -6/+8 |
| | | | | | | * | | | | | am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute ... | Deepanshu Gupta | 2014-05-13 | 2 | -3/+26 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | |||||
| | | | | | | | * | | | | am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO... | Deepanshu Gupta | 2014-05-13 | 2 | -3/+26 |
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | |||||
| | | | | | | | | * | | | am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 2 | -3/+26 |
| | | | | | | | | |\ \ \ | | | | | | | | | | |/ / | |||||
| | | | | | | | | | * | | Support actionProviderClass attribute for menus [DO NOT MERGE] | Deepanshu Gupta | 2014-05-07 | 2 | -3/+26 |
| | | | | | | * | | | | | am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to Over... | Deepanshu Gupta | 2014-05-13 | 1 | -1/+28 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | |||||
| | | | | | | | * | | | | am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [... | Deepanshu Gupta | 2014-05-13 | 1 | -1/+28 |
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | |||||
| | | | | | | | | * | | | am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -1/+28 |
| | | | | | | | | |\ \ \ | | | | | | | | | | |/ / | |||||
| | | | | | | | | | * | | Add special system view cookie to OverflowButton. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-07 | 1 | -1/+28 |
| | | | | | | * | | | | | am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -47/+44 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | |||||
| | | | | | | | * | | | | resolved conflicts for merge of 00d09649 to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -47/+44 |
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | |||||
| | | | | | | | | * | | | am 85f53c33: Fix style warnings in RenderSessionImpl [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -47/+44 |
| | | | | | | | | |\ \ \ | | | | | | | | | | |/ / | |||||
| | | | | | | | | | * | | Fix style warnings in RenderSessionImpl [DO NOT MERGE] | Deepanshu Gupta | 2014-05-07 | 1 | -47/+44 |
| | | | | | | * | | | | | am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus.... | Deepanshu Gupta | 2014-05-13 | 6 | -45/+251 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | |||||
| | | | | | | | * | | | | am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 6 | -45/+251 |
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | |||||
| | | | | | | | | * | | | am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 6 | -45/+251 |
| | | | | | | | | |\ \ \ | | | | | | | | | | |/ / | |||||
| | | | | | | | | | * | | Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-07 | 6 | -45/+251 |