From 7d5660f3e9d362d2167279c720aee3f277600efe Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:43:32 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-large-v4.json | 390 ++++++++++++++++++++-----------------------------------
1 files changed, 145 insertions(+), 245 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-large-v4.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-large-v4.json
index f38ccc2..20c4511 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-large-v4.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-large-v4.json
@@ -1,23 +1,23 @@
[
{
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
- "endColumn": 58,
- "endOffset": 109
+ "endColumn": 61,
+ "endOffset": 112
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
- "endColumn": 58,
- "endOffset": 109
+ "startOffset": 288,
+ "endColumn": 61,
+ "endOffset": 345
}
}
},
@@ -25,18 +25,18 @@
"to": {
"startLine": 3,
"startColumn": 4,
- "startOffset": 114,
- "endColumn": 70,
- "endOffset": 180
+ "startOffset": 117,
+ "endColumn": 71,
+ "endOffset": 184
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 3,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 114,
- "endColumn": 70,
- "endOffset": 180
+ "startOffset": 584,
+ "endColumn": 71,
+ "endOffset": 651
}
}
},
@@ -44,194 +44,18 @@
"to": {
"startLine": 4,
"startColumn": 4,
- "startOffset": 185,
- "endColumn": 70,
- "endOffset": 251
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 185,
- "endColumn": 70,
- "endOffset": 251
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 256,
- "endColumn": 69,
- "endOffset": 321
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 256,
- "endColumn": 69,
- "endOffset": 321
- }
- }
- },
- {
- "to": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 326,
- "endColumn": 69,
- "endOffset": 391
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 326,
- "endColumn": 69,
- "endOffset": 391
- }
- }
- },
- {
- "to": {
- "startLine": 7,
- "startColumn": 4,
- "startOffset": 396,
- "endColumn": 67,
- "endOffset": 459
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 7,
- "startColumn": 4,
- "startOffset": 396,
- "endColumn": 67,
- "endOffset": 459
- }
- }
- },
- {
- "to": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 464,
- "endColumn": 67,
- "endOffset": 527
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 464,
- "endColumn": 67,
- "endOffset": 527
- }
- }
- },
- {
- "to": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 532,
- "endColumn": 103,
- "endOffset": 631
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 532,
- "endColumn": 103,
- "endOffset": 631
- }
- }
- },
- {
- "to": {
- "startLine": 10,
- "startColumn": 4,
- "startOffset": 636,
- "endColumn": 115,
- "endOffset": 747
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 10,
- "startColumn": 4,
- "startOffset": 636,
- "endColumn": 115,
- "endOffset": 747
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
+ "startOffset": 189,
"endColumn": 58,
- "endOffset": 109
+ "endOffset": 243
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 2,
+ "startLine": 8,
"startColumn": 4,
- "startOffset": 55,
+ "startOffset": 656,
"endColumn": 58,
- "endOffset": 109
- }
- }
- },
- {
- "to": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 114,
- "endColumn": 70,
- "endOffset": 180
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 114,
- "endColumn": 70,
- "endOffset": 180
- }
- }
- },
- {
- "to": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 185,
- "endColumn": 70,
- "endOffset": 251
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
- "position": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 185,
- "endColumn": 70,
- "endOffset": 251
+ "endOffset": 710
}
}
},
@@ -239,18 +63,18 @@
"to": {
"startLine": 5,
"startColumn": 4,
- "startOffset": 256,
- "endColumn": 69,
- "endOffset": 321
+ "startOffset": 248,
+ "endColumn": 70,
+ "endOffset": 314
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 5,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 256,
- "endColumn": 69,
- "endOffset": 321
+ "startOffset": 949,
+ "endColumn": 70,
+ "endOffset": 1015
}
}
},
@@ -258,18 +82,18 @@
"to": {
"startLine": 6,
"startColumn": 4,
- "startOffset": 326,
- "endColumn": 69,
- "endOffset": 391
+ "startOffset": 319,
+ "endColumn": 70,
+ "endOffset": 385
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 6,
+ "startLine": 12,
"startColumn": 4,
- "startOffset": 326,
- "endColumn": 69,
- "endOffset": 391
+ "startOffset": 1020,
+ "endColumn": 70,
+ "endOffset": 1086
}
}
},
@@ -277,18 +101,18 @@
"to": {
"startLine": 7,
"startColumn": 4,
- "startOffset": 396,
- "endColumn": 67,
- "endOffset": 459
+ "startOffset": 390,
+ "endColumn": 69,
+ "endOffset": 455
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 7,
+ "startLine": 13,
"startColumn": 4,
- "startOffset": 396,
- "endColumn": 67,
- "endOffset": 459
+ "startOffset": 1091,
+ "endColumn": 69,
+ "endOffset": 1156
}
}
},
@@ -296,18 +120,18 @@
"to": {
"startLine": 8,
"startColumn": 4,
- "startOffset": 464,
- "endColumn": 67,
- "endOffset": 527
+ "startOffset": 460,
+ "endColumn": 69,
+ "endOffset": 525
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 8,
+ "startLine": 14,
"startColumn": 4,
- "startOffset": 464,
- "endColumn": 67,
- "endOffset": 527
+ "startOffset": 1161,
+ "endColumn": 69,
+ "endOffset": 1226
}
}
},
@@ -315,18 +139,18 @@
"to": {
"startLine": 9,
"startColumn": 4,
- "startOffset": 532,
- "endColumn": 103,
- "endOffset": 631
+ "startOffset": 530,
+ "endColumn": 67,
+ "endOffset": 593
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 9,
+ "startLine": 15,
"startColumn": 4,
- "startOffset": 532,
- "endColumn": 103,
- "endOffset": 631
+ "startOffset": 1231,
+ "endColumn": 67,
+ "endOffset": 1294
}
}
},
@@ -334,18 +158,94 @@
"to": {
"startLine": 10,
"startColumn": 4,
- "startOffset": 636,
- "endColumn": 115,
- "endOffset": 747
+ "startOffset": 598,
+ "endColumn": 67,
+ "endOffset": 661
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-large-v4\\values-large-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
"position": {
- "startLine": 10,
+ "startLine": 16,
"startColumn": 4,
- "startOffset": 636,
+ "startOffset": 1299,
+ "endColumn": 67,
+ "endOffset": 1362
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 11,
+ "startColumn": 4,
+ "startOffset": 666,
+ "endColumn": 63,
+ "endOffset": 725
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
+ "position": {
+ "startLine": 17,
+ "startColumn": 4,
+ "startOffset": 1367,
+ "endColumn": 63,
+ "endOffset": 1426
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 12,
+ "startColumn": 4,
+ "startOffset": 730,
+ "endColumn": 54,
+ "endOffset": 780
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
+ "position": {
+ "startLine": 18,
+ "startColumn": 4,
+ "startOffset": 1431,
+ "endColumn": 54,
+ "endOffset": 1481
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 13,
+ "startColumn": 4,
+ "startOffset": 785,
+ "endColumn": 103,
+ "endOffset": 884
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
+ "position": {
+ "startLine": 21,
+ "startColumn": 4,
+ "startOffset": 1725,
+ "endColumn": 103,
+ "endOffset": 1824
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 14,
+ "startColumn": 4,
+ "startOffset": 889,
+ "endColumn": 115,
+ "endOffset": 1000
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-large\\values-large.xml",
+ "position": {
+ "startLine": 22,
+ "startColumn": 4,
+ "startOffset": 1829,
"endColumn": 115,
- "endOffset": 747
+ "endOffset": 1940
}
}
}
--
Gitblit v1.8.0