| Commit message (Expand) | Author | Age | Files | Lines |
* | am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
|\ |
|
| * | resolved conflicts for merge of a232a68d to jb-mr1.1-docs | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| |\ |
|
| | * | resolved conflicts for merge of 5476cfee to jb-mr1-dev | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | |\ |
|
| | | * | am 505c675c: Fix SystemProperties in LayoutLib. | Deepanshu Gupta | 2014-08-06 | 3 | -49/+107 |
| | | |\ |
|
| | | | * | Fix SystemProperties in LayoutLib. | Deepanshu Gupta | 2014-08-05 | 3 | -49/+107 |
| * | | | | am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \... | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT ... | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| | |\ \ \
| | | |/ / |
|
| | | * | | am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] | Deepanshu Gupta | 2014-07-18 | 1 | -10/+7 |
| | | |\ \
| | | | |/ |
|
| | | | * | Fix style resolution for styles with '.' [DO NOT MERGE] | Deepanshu Gupta | 2014-07-10 | 1 | -10/+7 |
* | | | | | Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1... | Deepanshu Gupta | 2014-07-17 | 1 | -10/+7 |
|\ \ \ \ \ |
|
| * | | | | | Fix style resolution for styles with '.' [DO NOT MERGE] | Deepanshu Gupta | 2014-07-10 | 1 | -10/+7 |
* | | | | | | Fix default level flags for bidi. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-12 | 1 | -2/+2 |
|/ / / / / |
|
* | | | | | Change font family name. [DO NOT MERGE] | Deepanshu Gupta | 2014-07-08 | 2 | -49/+120 |
* | | | | | Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev | Deepanshu Gupta | 2014-07-08 | 4 | -0/+207 |
|\ \ \ \ \ |
|
| * | | | | | Add a script to rename fonts for SDK. [DO NOT MERGE] | Deepanshu Gupta | 2014-06-12 | 4 | -0/+207 |
* | | | | | | am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev | Deepanshu Gupta | 2014-06-04 | 1 | -0/+1 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | resolved conflicts for merge of 61fb5784 to jb-mr1-dev | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] | Deepanshu Gupta | 2014-06-04 | 3 | -34/+55 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 3 | -34/+55 |
| * | | | | | am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo... | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-06-03 | 1 | -1/+1 |
| | | |\ \ \
| | | | |/ / |
|
| | | | * | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 1 | -1/+1 |
| * | | | | | am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -13/+7 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Fix build due to incorrect merges [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -13/+7 |
* | | | | | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 3 | -34/+55 |
* | | | | | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 1 | -1/+1 |
* | | | | | | Remove @NonNull attribute [DO NOT MERGE] | Deepanshu Gupta | 2014-05-30 | 1 | -12/+10 |
| |_|_|_|/
|/| | | | |
|
* | | | | | 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 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 |
| |\ \ \ \ \
| | |/ / / / |
|