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-my-rMM.json | 639 +++++++++------------------------------------------------
1 files changed, 108 insertions(+), 531 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-my-rMM.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-my-rMM.json
index 556bfc7..5930af9 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-my-rMM.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-my-rMM.json
@@ -1,6 +1,6 @@
[
{
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my-rMM\\values-my-rMM.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my-rMM\\values-my-rMM.xml",
"map": [
{
"to": {
@@ -11,13 +11,13 @@
"endOffset": 159
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
+ "startOffset": 291,
"endColumn": 108,
- "endOffset": 159
+ "endOffset": 395
}
}
},
@@ -30,13 +30,13 @@
"endOffset": 267
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 3,
+ "startLine": 5,
"startColumn": 4,
- "startOffset": 164,
+ "startOffset": 400,
"endColumn": 107,
- "endOffset": 267
+ "endOffset": 503
}
}
},
@@ -49,13 +49,13 @@
"endOffset": 392
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 4,
+ "startLine": 6,
"startColumn": 4,
- "startOffset": 272,
+ "startOffset": 508,
"endColumn": 124,
- "endOffset": 392
+ "endOffset": 628
}
}
},
@@ -68,13 +68,13 @@
"endOffset": 497
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 5,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 397,
+ "startOffset": 633,
"endColumn": 104,
- "endOffset": 497
+ "endOffset": 733
}
}
},
@@ -87,13 +87,13 @@
"endOffset": 614
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 6,
+ "startLine": 8,
"startColumn": 4,
- "startOffset": 502,
+ "startOffset": 738,
"endColumn": 116,
- "endOffset": 614
+ "endOffset": 850
}
}
},
@@ -106,13 +106,13 @@
"endOffset": 707
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 7,
+ "startLine": 9,
"startColumn": 4,
- "startOffset": 619,
+ "startOffset": 855,
"endColumn": 92,
- "endOffset": 707
+ "endOffset": 943
}
}
},
@@ -125,13 +125,13 @@
"endOffset": 819
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 8,
+ "startLine": 10,
"startColumn": 4,
- "startOffset": 712,
+ "startOffset": 948,
"endColumn": 111,
- "endOffset": 819
+ "endOffset": 1055
}
}
},
@@ -140,17 +140,17 @@
"startLine": 9,
"startColumn": 4,
"startOffset": 824,
- "endColumn": 127,
- "endOffset": 947
+ "endColumn": 135,
+ "endOffset": 955
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 9,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 824,
- "endColumn": 127,
- "endOffset": 947
+ "startOffset": 1060,
+ "endColumn": 135,
+ "endOffset": 1191
}
}
},
@@ -158,18 +158,18 @@
"to": {
"startLine": 10,
"startColumn": 4,
- "startOffset": 952,
+ "startOffset": 960,
"endColumn": 77,
- "endOffset": 1025
+ "endOffset": 1033
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 10,
+ "startLine": 12,
"startColumn": 4,
- "startOffset": 952,
+ "startOffset": 1196,
"endColumn": 77,
- "endOffset": 1025
+ "endOffset": 1269
}
}
},
@@ -177,18 +177,18 @@
"to": {
"startLine": 11,
"startColumn": 4,
- "startOffset": 1030,
+ "startOffset": 1038,
"endColumn": 78,
- "endOffset": 1104
+ "endOffset": 1112
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 11,
+ "startLine": 13,
"startColumn": 4,
- "startOffset": 1030,
+ "startOffset": 1274,
"endColumn": 78,
- "endOffset": 1104
+ "endOffset": 1348
}
}
},
@@ -196,18 +196,18 @@
"to": {
"startLine": 12,
"startColumn": 4,
- "startOffset": 1109,
+ "startOffset": 1117,
"endColumn": 85,
- "endOffset": 1190
+ "endOffset": 1198
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 12,
+ "startLine": 14,
"startColumn": 4,
- "startOffset": 1109,
+ "startOffset": 1353,
"endColumn": 85,
- "endOffset": 1190
+ "endOffset": 1434
}
}
},
@@ -215,422 +215,18 @@
"to": {
"startLine": 13,
"startColumn": 4,
- "startOffset": 1195,
- "endColumn": 122,
- "endOffset": 1313
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 13,
- "startColumn": 4,
- "startOffset": 1195,
- "endColumn": 122,
- "endOffset": 1313
- }
- }
- },
- {
- "to": {
- "startLine": 14,
- "startColumn": 4,
- "startOffset": 1318,
- "endColumn": 111,
- "endOffset": 1425
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 14,
- "startColumn": 4,
- "startOffset": 1318,
- "endColumn": 111,
- "endOffset": 1425
- }
- }
- },
- {
- "to": {
- "startLine": 15,
- "startColumn": 4,
- "startOffset": 1430,
- "endColumn": 101,
- "endOffset": 1527
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 15,
- "startColumn": 4,
- "startOffset": 1430,
- "endColumn": 101,
- "endOffset": 1527
- }
- }
- },
- {
- "to": {
- "startLine": 16,
- "startColumn": 4,
- "startOffset": 1532,
- "endColumn": 125,
- "endOffset": 1653
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 16,
- "startColumn": 4,
- "startOffset": 1532,
- "endColumn": 125,
- "endOffset": 1653
- }
- }
- },
- {
- "to": {
- "startLine": 17,
- "startColumn": 4,
- "startOffset": 1658,
- "endColumn": 110,
- "endOffset": 1764
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 17,
- "startColumn": 4,
- "startOffset": 1658,
- "endColumn": 110,
- "endOffset": 1764
- }
- }
- },
- {
- "to": {
- "startLine": 18,
- "startColumn": 4,
- "startOffset": 1769,
- "endColumn": 109,
- "endOffset": 1874
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 18,
- "startColumn": 4,
- "startOffset": 1769,
- "endColumn": 109,
- "endOffset": 1874
- }
- }
- },
- {
- "to": {
- "startLine": 19,
- "startColumn": 4,
- "startOffset": 1879,
- "endColumn": 122,
- "endOffset": 1997
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 19,
- "startColumn": 4,
- "startOffset": 1879,
- "endColumn": 122,
- "endOffset": 1997
- }
- }
- },
- {
- "to": {
- "startLine": 20,
- "startColumn": 4,
- "startOffset": 2002,
- "endColumn": 99,
- "endOffset": 2097
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 20,
- "startColumn": 4,
- "startOffset": 2002,
- "endColumn": 99,
- "endOffset": 2097
- }
- }
- },
- {
- "to": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 2102,
- "endColumn": 83,
- "endOffset": 2181
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 2102,
- "endColumn": 83,
- "endOffset": 2181
- }
- }
- },
- {
- "to": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 2186,
- "endColumn": 100,
- "endOffset": 2282
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 2186,
- "endColumn": 100,
- "endOffset": 2282
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my-rMM\\values-my-rMM.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 108,
- "endOffset": 159
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 108,
- "endOffset": 159
- }
- }
- },
- {
- "to": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 164,
- "endColumn": 107,
- "endOffset": 267
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 164,
- "endColumn": 107,
- "endOffset": 267
- }
- }
- },
- {
- "to": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 272,
+ "startOffset": 1203,
"endColumn": 124,
- "endOffset": 392
+ "endOffset": 1323
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 4,
+ "startLine": 15,
"startColumn": 4,
- "startOffset": 272,
+ "startOffset": 1439,
"endColumn": 124,
- "endOffset": 392
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 397,
- "endColumn": 104,
- "endOffset": 497
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 397,
- "endColumn": 104,
- "endOffset": 497
- }
- }
- },
- {
- "to": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 502,
- "endColumn": 116,
- "endOffset": 614
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 502,
- "endColumn": 116,
- "endOffset": 614
- }
- }
- },
- {
- "to": {
- "startLine": 7,
- "startColumn": 4,
- "startOffset": 619,
- "endColumn": 92,
- "endOffset": 707
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 7,
- "startColumn": 4,
- "startOffset": 619,
- "endColumn": 92,
- "endOffset": 707
- }
- }
- },
- {
- "to": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 712,
- "endColumn": 111,
- "endOffset": 819
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 712,
- "endColumn": 111,
- "endOffset": 819
- }
- }
- },
- {
- "to": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 824,
- "endColumn": 127,
- "endOffset": 947
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 824,
- "endColumn": 127,
- "endOffset": 947
- }
- }
- },
- {
- "to": {
- "startLine": 10,
- "startColumn": 4,
- "startOffset": 952,
- "endColumn": 77,
- "endOffset": 1025
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 10,
- "startColumn": 4,
- "startOffset": 952,
- "endColumn": 77,
- "endOffset": 1025
- }
- }
- },
- {
- "to": {
- "startLine": 11,
- "startColumn": 4,
- "startOffset": 1030,
- "endColumn": 78,
- "endOffset": 1104
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 11,
- "startColumn": 4,
- "startOffset": 1030,
- "endColumn": 78,
- "endOffset": 1104
- }
- }
- },
- {
- "to": {
- "startLine": 12,
- "startColumn": 4,
- "startOffset": 1109,
- "endColumn": 85,
- "endOffset": 1190
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 12,
- "startColumn": 4,
- "startOffset": 1109,
- "endColumn": 85,
- "endOffset": 1190
- }
- }
- },
- {
- "to": {
- "startLine": 13,
- "startColumn": 4,
- "startOffset": 1195,
- "endColumn": 122,
- "endOffset": 1313
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 13,
- "startColumn": 4,
- "startOffset": 1195,
- "endColumn": 122,
- "endOffset": 1313
+ "endOffset": 1559
}
}
},
@@ -638,18 +234,18 @@
"to": {
"startLine": 14,
"startColumn": 4,
- "startOffset": 1318,
+ "startOffset": 1328,
"endColumn": 111,
- "endOffset": 1425
+ "endOffset": 1435
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 14,
+ "startLine": 16,
"startColumn": 4,
- "startOffset": 1318,
+ "startOffset": 1564,
"endColumn": 111,
- "endOffset": 1425
+ "endOffset": 1671
}
}
},
@@ -657,18 +253,18 @@
"to": {
"startLine": 15,
"startColumn": 4,
- "startOffset": 1430,
+ "startOffset": 1440,
"endColumn": 101,
- "endOffset": 1527
+ "endOffset": 1537
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 15,
+ "startLine": 17,
"startColumn": 4,
- "startOffset": 1430,
+ "startOffset": 1676,
"endColumn": 101,
- "endOffset": 1527
+ "endOffset": 1773
}
}
},
@@ -676,18 +272,18 @@
"to": {
"startLine": 16,
"startColumn": 4,
- "startOffset": 1532,
+ "startOffset": 1542,
"endColumn": 125,
- "endOffset": 1653
+ "endOffset": 1663
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 16,
+ "startLine": 18,
"startColumn": 4,
- "startOffset": 1532,
+ "startOffset": 1778,
"endColumn": 125,
- "endOffset": 1653
+ "endOffset": 1899
}
}
},
@@ -695,18 +291,18 @@
"to": {
"startLine": 17,
"startColumn": 4,
- "startOffset": 1658,
+ "startOffset": 1668,
"endColumn": 110,
- "endOffset": 1764
+ "endOffset": 1774
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 17,
+ "startLine": 19,
"startColumn": 4,
- "startOffset": 1658,
+ "startOffset": 1904,
"endColumn": 110,
- "endOffset": 1764
+ "endOffset": 2010
}
}
},
@@ -714,18 +310,18 @@
"to": {
"startLine": 18,
"startColumn": 4,
- "startOffset": 1769,
+ "startOffset": 1779,
"endColumn": 109,
- "endOffset": 1874
+ "endOffset": 1884
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 18,
+ "startLine": 20,
"startColumn": 4,
- "startOffset": 1769,
+ "startOffset": 2015,
"endColumn": 109,
- "endOffset": 1874
+ "endOffset": 2120
}
}
},
@@ -733,18 +329,18 @@
"to": {
"startLine": 19,
"startColumn": 4,
- "startOffset": 1879,
+ "startOffset": 1889,
"endColumn": 122,
- "endOffset": 1997
+ "endOffset": 2007
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 19,
+ "startLine": 21,
"startColumn": 4,
- "startOffset": 1879,
+ "startOffset": 2125,
"endColumn": 122,
- "endOffset": 1997
+ "endOffset": 2243
}
}
},
@@ -752,18 +348,18 @@
"to": {
"startLine": 20,
"startColumn": 4,
- "startOffset": 2002,
+ "startOffset": 2012,
"endColumn": 99,
- "endOffset": 2097
+ "endOffset": 2107
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 20,
+ "startLine": 22,
"startColumn": 4,
- "startOffset": 2002,
+ "startOffset": 2248,
"endColumn": 99,
- "endOffset": 2097
+ "endOffset": 2343
}
}
},
@@ -771,37 +367,18 @@
"to": {
"startLine": 21,
"startColumn": 4,
- "startOffset": 2102,
- "endColumn": 83,
- "endOffset": 2181
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
- "position": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 2102,
- "endColumn": 83,
- "endOffset": 2181
- }
- }
- },
- {
- "to": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 2186,
+ "startOffset": 2112,
"endColumn": 100,
- "endOffset": 2282
+ "endOffset": 2208
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-my-rMM\\values-my-rMM.xml",
"position": {
- "startLine": 22,
+ "startLine": 23,
"startColumn": 4,
- "startOffset": 2186,
+ "startOffset": 2348,
"endColumn": 100,
- "endOffset": 2282
+ "endOffset": 2444
}
}
}
--
Gitblit v1.8.0