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-v17.json | 441 ++++++++----------------------------------------------
1 files changed, 71 insertions(+), 370 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v17.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v17.json
index 15823df..e8d58f8 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v17.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v17.json
@@ -1,6 +1,6 @@
[
{
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
"map": [
{
"to": {
@@ -12,14 +12,14 @@
"endOffset": 223
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
- "endLine": 4,
+ "startOffset": 291,
+ "endLine": 6,
"endColumn": 12,
- "endOffset": 223
+ "endOffset": 459
}
}
},
@@ -33,14 +33,14 @@
"endOffset": 451
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 5,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 228,
- "endLine": 8,
+ "startOffset": 464,
+ "endLine": 10,
"endColumn": 12,
- "endOffset": 451
+ "endOffset": 687
}
}
},
@@ -54,14 +54,14 @@
"endOffset": 609
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 9,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 456,
- "endLine": 11,
+ "startOffset": 692,
+ "endLine": 13,
"endColumn": 12,
- "endOffset": 609
+ "endOffset": 845
}
}
},
@@ -75,14 +75,14 @@
"endOffset": 759
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 12,
+ "startLine": 14,
"startColumn": 4,
- "startOffset": 614,
- "endLine": 14,
+ "startOffset": 850,
+ "endLine": 16,
"endColumn": 12,
- "endOffset": 759
+ "endOffset": 995
}
}
},
@@ -96,14 +96,14 @@
"endOffset": 931
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 15,
+ "startLine": 17,
"startColumn": 4,
- "startOffset": 764,
- "endLine": 17,
+ "startOffset": 1000,
+ "endLine": 19,
"endColumn": 12,
- "endOffset": 931
+ "endOffset": 1167
}
}
},
@@ -117,14 +117,14 @@
"endOffset": 1159
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 18,
+ "startLine": 20,
"startColumn": 4,
- "startOffset": 936,
- "endLine": 21,
+ "startOffset": 1172,
+ "endLine": 23,
"endColumn": 12,
- "endOffset": 1159
+ "endOffset": 1395
}
}
},
@@ -138,14 +138,14 @@
"endOffset": 1401
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 22,
+ "startLine": 24,
"startColumn": 4,
- "startOffset": 1164,
- "endLine": 25,
+ "startOffset": 1400,
+ "endLine": 27,
"endColumn": 12,
- "endOffset": 1401
+ "endOffset": 1637
}
}
},
@@ -159,14 +159,14 @@
"endOffset": 1572
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 26,
+ "startLine": 28,
"startColumn": 4,
- "startOffset": 1406,
- "endLine": 28,
+ "startOffset": 1642,
+ "endLine": 30,
"endColumn": 12,
- "endOffset": 1572
+ "endOffset": 1808
}
}
},
@@ -180,14 +180,14 @@
"endOffset": 1746
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 29,
+ "startLine": 31,
"startColumn": 4,
- "startOffset": 1577,
- "endLine": 31,
+ "startOffset": 1813,
+ "endLine": 33,
"endColumn": 12,
- "endOffset": 1746
+ "endOffset": 1982
}
}
},
@@ -201,14 +201,14 @@
"endOffset": 1915
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 32,
+ "startLine": 34,
"startColumn": 4,
- "startOffset": 1751,
- "endLine": 34,
+ "startOffset": 1987,
+ "endLine": 36,
"endColumn": 12,
- "endOffset": 1915
+ "endOffset": 2151
}
}
},
@@ -222,14 +222,14 @@
"endOffset": 2188
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 35,
+ "startLine": 37,
"startColumn": 4,
- "startOffset": 1920,
- "endLine": 38,
+ "startOffset": 2156,
+ "endLine": 40,
"endColumn": 12,
- "endOffset": 2188
+ "endOffset": 2424
}
}
},
@@ -243,14 +243,14 @@
"endOffset": 2388
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 39,
+ "startLine": 41,
"startColumn": 4,
- "startOffset": 2193,
- "endLine": 41,
+ "startOffset": 2429,
+ "endLine": 43,
"endColumn": 12,
- "endOffset": 2388
+ "endOffset": 2624
}
}
},
@@ -264,14 +264,14 @@
"endOffset": 2592
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 42,
+ "startLine": 44,
"startColumn": 4,
- "startOffset": 2393,
- "endLine": 45,
+ "startOffset": 2629,
+ "endLine": 47,
"endColumn": 12,
- "endOffset": 2592
+ "endOffset": 2828
}
}
},
@@ -285,313 +285,14 @@
"endOffset": 2921
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v17\\values-v17.xml",
"position": {
- "startLine": 46,
+ "startLine": 48,
"startColumn": 4,
- "startOffset": 2597,
- "endLine": 49,
+ "startOffset": 2833,
+ "endLine": 51,
"endColumn": 12,
- "endOffset": 2921
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endLine": 4,
- "endColumn": 12,
- "endOffset": 223
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endLine": 4,
- "endColumn": 12,
- "endOffset": 223
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 228,
- "endLine": 8,
- "endColumn": 12,
- "endOffset": 451
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 228,
- "endLine": 8,
- "endColumn": 12,
- "endOffset": 451
- }
- }
- },
- {
- "to": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 456,
- "endLine": 11,
- "endColumn": 12,
- "endOffset": 609
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 456,
- "endLine": 11,
- "endColumn": 12,
- "endOffset": 609
- }
- }
- },
- {
- "to": {
- "startLine": 12,
- "startColumn": 4,
- "startOffset": 614,
- "endLine": 14,
- "endColumn": 12,
- "endOffset": 759
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 12,
- "startColumn": 4,
- "startOffset": 614,
- "endLine": 14,
- "endColumn": 12,
- "endOffset": 759
- }
- }
- },
- {
- "to": {
- "startLine": 15,
- "startColumn": 4,
- "startOffset": 764,
- "endLine": 17,
- "endColumn": 12,
- "endOffset": 931
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 15,
- "startColumn": 4,
- "startOffset": 764,
- "endLine": 17,
- "endColumn": 12,
- "endOffset": 931
- }
- }
- },
- {
- "to": {
- "startLine": 18,
- "startColumn": 4,
- "startOffset": 936,
- "endLine": 21,
- "endColumn": 12,
- "endOffset": 1159
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 18,
- "startColumn": 4,
- "startOffset": 936,
- "endLine": 21,
- "endColumn": 12,
- "endOffset": 1159
- }
- }
- },
- {
- "to": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 1164,
- "endLine": 25,
- "endColumn": 12,
- "endOffset": 1401
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 1164,
- "endLine": 25,
- "endColumn": 12,
- "endOffset": 1401
- }
- }
- },
- {
- "to": {
- "startLine": 26,
- "startColumn": 4,
- "startOffset": 1406,
- "endLine": 28,
- "endColumn": 12,
- "endOffset": 1572
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 26,
- "startColumn": 4,
- "startOffset": 1406,
- "endLine": 28,
- "endColumn": 12,
- "endOffset": 1572
- }
- }
- },
- {
- "to": {
- "startLine": 29,
- "startColumn": 4,
- "startOffset": 1577,
- "endLine": 31,
- "endColumn": 12,
- "endOffset": 1746
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 29,
- "startColumn": 4,
- "startOffset": 1577,
- "endLine": 31,
- "endColumn": 12,
- "endOffset": 1746
- }
- }
- },
- {
- "to": {
- "startLine": 32,
- "startColumn": 4,
- "startOffset": 1751,
- "endLine": 34,
- "endColumn": 12,
- "endOffset": 1915
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 32,
- "startColumn": 4,
- "startOffset": 1751,
- "endLine": 34,
- "endColumn": 12,
- "endOffset": 1915
- }
- }
- },
- {
- "to": {
- "startLine": 35,
- "startColumn": 4,
- "startOffset": 1920,
- "endLine": 38,
- "endColumn": 12,
- "endOffset": 2188
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 35,
- "startColumn": 4,
- "startOffset": 1920,
- "endLine": 38,
- "endColumn": 12,
- "endOffset": 2188
- }
- }
- },
- {
- "to": {
- "startLine": 39,
- "startColumn": 4,
- "startOffset": 2193,
- "endLine": 41,
- "endColumn": 12,
- "endOffset": 2388
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 39,
- "startColumn": 4,
- "startOffset": 2193,
- "endLine": 41,
- "endColumn": 12,
- "endOffset": 2388
- }
- }
- },
- {
- "to": {
- "startLine": 42,
- "startColumn": 4,
- "startOffset": 2393,
- "endLine": 45,
- "endColumn": 12,
- "endOffset": 2592
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 42,
- "startColumn": 4,
- "startOffset": 2393,
- "endLine": 45,
- "endColumn": 12,
- "endOffset": 2592
- }
- }
- },
- {
- "to": {
- "startLine": 46,
- "startColumn": 4,
- "startOffset": 2597,
- "endLine": 49,
- "endColumn": 12,
- "endOffset": 2921
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v17\\values-v17.xml",
- "position": {
- "startLine": 46,
- "startColumn": 4,
- "startOffset": 2597,
- "endLine": 49,
- "endColumn": 12,
- "endOffset": 2921
+ "endOffset": 3157
}
}
}
--
Gitblit v1.8.0