summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docsDeepanshu Gupta2014-08-063-49/+107
|\
| * resolved conflicts for merge of a232a68d to jb-mr1.1-docsDeepanshu Gupta2014-08-063-49/+107
| |\
| | * resolved conflicts for merge of 5476cfee to jb-mr1-devDeepanshu Gupta2014-08-063-49/+107
| | |\
| | | * am 505c675c: Fix SystemProperties in LayoutLib.Deepanshu Gupta2014-08-063-49/+107
| | | |\
| | | | * Fix SystemProperties in LayoutLib.Deepanshu Gupta2014-08-053-49/+107
| * | | | am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \...Deepanshu Gupta2014-07-181-10/+7
| |\ \ \ \ | | |/ / /
| | * | | am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT ...Deepanshu Gupta2014-07-181-10/+7
| | |\ \ \ | | | |/ /
| | | * | am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]Deepanshu Gupta2014-07-181-10/+7
| | | |\ \ | | | | |/
| | | | * Fix style resolution for styles with '.' [DO NOT MERGE]Deepanshu Gupta2014-07-101-10/+7
* | | | | Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1...Deepanshu Gupta2014-07-171-10/+7
|\ \ \ \ \
| * | | | | Fix style resolution for styles with '.' [DO NOT MERGE]Deepanshu Gupta2014-07-101-10/+7
* | | | | | Fix default level flags for bidi. [DO NOT MERGE]Deepanshu Gupta2014-07-121-2/+2
|/ / / / /
* | | | | Change font family name. [DO NOT MERGE]Deepanshu Gupta2014-07-082-49/+120
* | | | | Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-devDeepanshu Gupta2014-07-084-0/+207
|\ \ \ \ \
| * | | | | Add a script to rename fonts for SDK. [DO NOT MERGE]Deepanshu Gupta2014-06-124-0/+207
* | | | | | am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-041-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-043-34/+55
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-043-34/+55
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-06-043-34/+55
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-05-303-34/+55
| * | | | | am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo...Deepanshu Gupta2014-06-031-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-06-031-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-05-301-1/+1
| * | | | | am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]Deepanshu Gupta2014-05-131-13/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix build due to incorrect merges [DO NOT MERGE]Deepanshu Gupta2014-05-131-13/+7
* | | | | | Distinguish between menus in ActionBar and popup. [DO NOT MERGE]Deepanshu Gupta2014-05-303-34/+55
* | | | | | LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]Deepanshu Gupta2014-05-301-1/+1
* | | | | | Remove @NonNull attribute [DO NOT MERGE]Deepanshu Gupta2014-05-301-12/+10
| |_|_|_|/ |/| | | |
* | | | | am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-131-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 1c55797d: Fix buildDeepanshu Gupta2014-05-131-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Fix buildDeepanshu Gupta2014-05-131-1/+0
| * | | | am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correct...Deepanshu Gupta2014-05-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-d...Deepanshu Gupta2014-05-131-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aospDeepanshu Gupta2014-05-131-1/+1
| | | |\ \
| | | | * | resolve conflicts for merge 5a7b3b65 correctlyDeepanshu Gupta2014-05-121-1/+1
* | | | | | am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-devDeepanshu Gupta2014-05-131-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-devDeepanshu Gupta2014-05-131-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | resolved conflicts for merge of 7377c7be to jb-mr1-devDeepanshu Gupta2014-05-131-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]Deepanshu Gupta2014-05-132-6/+8
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]Deepanshu Gupta2014-05-072-6/+8
| * | | | | am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute ...Deepanshu Gupta2014-05-132-3/+26
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO...Deepanshu Gupta2014-05-132-3/+26
| | |\ \ \ \ | | | |/ / /
| | | * | | am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]Deepanshu Gupta2014-05-132-3/+26
| | | |\ \ \ | | | | |/ /
| | | | * | Support actionProviderClass attribute for menus [DO NOT MERGE]Deepanshu Gupta2014-05-072-3/+26
| * | | | | am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to Over...Deepanshu Gupta2014-05-131-1/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [...Deepanshu Gupta2014-05-131-1/+28
| | |\ \ \ \ | | | |/ / /
| | | * | | am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+28
| | | |\ \ \ | | | | |/ /
| | | | * | Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-05-071-1/+28
| * | | | | am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-devDeepanshu Gupta2014-05-131-47/+44
| |\ \ \ \ \ | | |/ / / /