summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Don't dump data from a bad ResTable"Adam Lesinski2014-05-212-0/+11
|\
| * Don't dump data from a bad ResTableAdam Lesinski2014-05-192-0/+11
* | am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
|\ \ | |/ |/|
| * am 6099fd21: Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
| |\
| | * Fix build.Jeff Brown2014-05-201-1/+1
* | | Merge "Add a script to rename fonts for SDK."Deepanshu Gupta2014-05-164-0/+174
|\ \ \
| * | | Add a script to rename fonts for SDK.Deepanshu Gupta2014-05-164-0/+174
* | | | Merge "Variant of sendBroadcast with appOp flag for cross-user."Amith Yamasani2014-05-161-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Variant of sendBroadcast with appOp flag for cross-user.Amith Yamasani2014-05-161-0/+8
* | | | Merge "LayoutLib: Correctly resolve ?attr/foo"Deepanshu Gupta2014-05-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | LayoutLib: Correctly resolve ?attr/fooDeepanshu Gupta2014-05-151-1/+1
* | | | Merge "Layoutlib: Update delegates for L"Deepanshu Gupta2014-05-155-29/+32
|\ \ \ \
| * | | | Layoutlib: Update delegates for LDeepanshu Gupta2014-05-155-29/+32
| |/ / /
* | | | Merge "AAPT dump badging should allow refs in meta-data"Adam Lesinski2014-05-151-1/+1
|\ \ \ \
| * | | | AAPT dump badging should allow refs in meta-dataAdam Lesinski2014-05-151-1/+1
* | | | | Merge "Fix crash in AAPT dump badging with bad StringPool"Adam Lesinski2014-05-151-7/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix crash in AAPT dump badging with bad StringPoolAdam Lesinski2014-05-151-7/+38
| |/ / /
* | | | am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e:...Deepanshu Gupta2014-05-141-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b:...Deepanshu Gupta2014-05-141-1/+0
| |\ \ \ | | | |/ | | |/|
| | * | am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721:...Deepanshu Gupta2014-05-141-1/+0
| | |\ \
| | | * \ am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3:...Deepanshu Gupta2014-05-141-1/+0
| | | |\ \
| | | | * \ am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a:...Deepanshu Gupta2014-05-141-1/+0
| | | | |\ \
| | | | | * \ am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445:...Deepanshu Gupta2014-05-141-1/+0
| | | | | |\ \
| | | | | | * \ am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d:...Deepanshu Gupta2014-05-141-1/+0
| | | | | | |\ \
| | | | | | | * \ am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-141-1/+0
| | | | | | | |\ \
| | | | | | | | * \ am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix buildDeepanshu Gupta2014-05-131-1/+0
| | | | | | | | |\ \
| | | | | | | | | * \ 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 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a:...Deepanshu Gupta2014-05-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509:...Deepanshu Gupta2014-05-131-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3:...Deepanshu Gupta2014-05-131-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a:...Deepanshu Gupta2014-05-131-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a:...Deepanshu Gupta2014-05-131-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5:...Deepanshu Gupta2014-05-131-0/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce:...Deepanshu Gupta2014-05-131-0/+2
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / /
| | | | | | | * | | | | | | | am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved con...Deepanshu Gupta2014-05-131-0/+2
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for me...Deepanshu Gupta2014-05-131-0/+2
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | | 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
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /