From 23c3323984f984d36248f107a320a8717b430049 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 21 三月 2017 16:23:01 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-hr.json | 585 ++++++++--------------------------------------------------
1 files changed, 81 insertions(+), 504 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-hr.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-hr.json
index 7570115..cb2d047 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-hr.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-hr.json
@@ -1,409 +1,5 @@
[
{
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 104,
- "endOffset": 155
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 104,
- "endOffset": 155
- }
- }
- },
- {
- "to": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 160,
- "endColumn": 107,
- "endOffset": 263
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 160,
- "endColumn": 107,
- "endOffset": 263
- }
- }
- },
- {
- "to": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 268,
- "endColumn": 122,
- "endOffset": 386
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 268,
- "endColumn": 122,
- "endOffset": 386
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 391,
- "endColumn": 96,
- "endOffset": 483
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 391,
- "endColumn": 96,
- "endOffset": 483
- }
- }
- },
- {
- "to": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 488,
- "endColumn": 109,
- "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-hr\\values-hr.xml",
- "position": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 488,
- "endColumn": 109,
- "endOffset": 593
- }
- }
- },
- {
- "to": {
- "startLine": 7,
- "startColumn": 4,
- "startOffset": 598,
- "endColumn": 85,
- "endOffset": 679
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 7,
- "startColumn": 4,
- "startOffset": 598,
- "endColumn": 85,
- "endOffset": 679
- }
- }
- },
- {
- "to": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 684,
- "endColumn": 103,
- "endOffset": 783
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 684,
- "endColumn": 103,
- "endOffset": 783
- }
- }
- },
- {
- "to": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 788,
- "endColumn": 118,
- "endOffset": 902
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 788,
- "endColumn": 118,
- "endOffset": 902
- }
- }
- },
- {
- "to": {
- "startLine": 10,
- "startColumn": 4,
- "startOffset": 907,
- "endColumn": 83,
- "endOffset": 986
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 10,
- "startColumn": 4,
- "startOffset": 907,
- "endColumn": 83,
- "endOffset": 986
- }
- }
- },
- {
- "to": {
- "startLine": 11,
- "startColumn": 4,
- "startOffset": 991,
- "endColumn": 82,
- "endOffset": 1069
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 11,
- "startColumn": 4,
- "startOffset": 991,
- "endColumn": 82,
- "endOffset": 1069
- }
- }
- },
- {
- "to": {
- "startLine": 12,
- "startColumn": 4,
- "startOffset": 1074,
- "endColumn": 85,
- "endOffset": 1155
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 12,
- "startColumn": 4,
- "startOffset": 1074,
- "endColumn": 85,
- "endOffset": 1155
- }
- }
- },
- {
- "to": {
- "startLine": 13,
- "startColumn": 4,
- "startOffset": 1160,
- "endColumn": 103,
- "endOffset": 1259
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 13,
- "startColumn": 4,
- "startOffset": 1160,
- "endColumn": 103,
- "endOffset": 1259
- }
- }
- },
- {
- "to": {
- "startLine": 14,
- "startColumn": 4,
- "startOffset": 1264,
- "endColumn": 112,
- "endOffset": 1372
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 14,
- "startColumn": 4,
- "startOffset": 1264,
- "endColumn": 112,
- "endOffset": 1372
- }
- }
- },
- {
- "to": {
- "startLine": 15,
- "startColumn": 4,
- "startOffset": 1377,
- "endColumn": 105,
- "endOffset": 1478
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 15,
- "startColumn": 4,
- "startOffset": 1377,
- "endColumn": 105,
- "endOffset": 1478
- }
- }
- },
- {
- "to": {
- "startLine": 16,
- "startColumn": 4,
- "startOffset": 1483,
- "endColumn": 104,
- "endOffset": 1583
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 16,
- "startColumn": 4,
- "startOffset": 1483,
- "endColumn": 104,
- "endOffset": 1583
- }
- }
- },
- {
- "to": {
- "startLine": 17,
- "startColumn": 4,
- "startOffset": 1588,
- "endColumn": 112,
- "endOffset": 1696
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 17,
- "startColumn": 4,
- "startOffset": 1588,
- "endColumn": 112,
- "endOffset": 1696
- }
- }
- },
- {
- "to": {
- "startLine": 18,
- "startColumn": 4,
- "startOffset": 1701,
- "endColumn": 106,
- "endOffset": 1803
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 18,
- "startColumn": 4,
- "startOffset": 1701,
- "endColumn": 106,
- "endOffset": 1803
- }
- }
- },
- {
- "to": {
- "startLine": 19,
- "startColumn": 4,
- "startOffset": 1808,
- "endColumn": 122,
- "endOffset": 1926
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 19,
- "startColumn": 4,
- "startOffset": 1808,
- "endColumn": 122,
- "endOffset": 1926
- }
- }
- },
- {
- "to": {
- "startLine": 20,
- "startColumn": 4,
- "startOffset": 1931,
- "endColumn": 96,
- "endOffset": 2023
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 20,
- "startColumn": 4,
- "startOffset": 1931,
- "endColumn": 96,
- "endOffset": 2023
- }
- }
- },
- {
- "to": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 2028,
- "endColumn": 88,
- "endOffset": 2112
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 2028,
- "endColumn": 88,
- "endOffset": 2112
- }
- }
- },
- {
- "to": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 2117,
- "endColumn": 100,
- "endOffset": 2213
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 2117,
- "endColumn": 100,
- "endOffset": 2213
- }
- }
- }
- ]
- },
- {
"outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
"map": [
{
@@ -415,13 +11,13 @@
"endOffset": 155
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
+ "startOffset": 287,
"endColumn": 104,
- "endOffset": 155
+ "endOffset": 387
}
}
},
@@ -434,13 +30,13 @@
"endOffset": 263
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 3,
+ "startLine": 5,
"startColumn": 4,
- "startOffset": 160,
+ "startOffset": 392,
"endColumn": 107,
- "endOffset": 263
+ "endOffset": 495
}
}
},
@@ -453,13 +49,13 @@
"endOffset": 386
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 4,
+ "startLine": 6,
"startColumn": 4,
- "startOffset": 268,
+ "startOffset": 500,
"endColumn": 122,
- "endOffset": 386
+ "endOffset": 618
}
}
},
@@ -472,13 +68,13 @@
"endOffset": 483
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 5,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 391,
+ "startOffset": 623,
"endColumn": 96,
- "endOffset": 483
+ "endOffset": 715
}
}
},
@@ -491,13 +87,13 @@
"endOffset": 593
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 6,
+ "startLine": 8,
"startColumn": 4,
- "startOffset": 488,
+ "startOffset": 720,
"endColumn": 109,
- "endOffset": 593
+ "endOffset": 825
}
}
},
@@ -510,13 +106,13 @@
"endOffset": 679
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 7,
+ "startLine": 9,
"startColumn": 4,
- "startOffset": 598,
+ "startOffset": 830,
"endColumn": 85,
- "endOffset": 679
+ "endOffset": 911
}
}
},
@@ -529,13 +125,13 @@
"endOffset": 783
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 8,
+ "startLine": 10,
"startColumn": 4,
- "startOffset": 684,
+ "startOffset": 916,
"endColumn": 103,
- "endOffset": 783
+ "endOffset": 1015
}
}
},
@@ -548,13 +144,13 @@
"endOffset": 902
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 9,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 788,
+ "startOffset": 1020,
"endColumn": 118,
- "endOffset": 902
+ "endOffset": 1134
}
}
},
@@ -567,13 +163,13 @@
"endOffset": 986
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 10,
+ "startLine": 12,
"startColumn": 4,
- "startOffset": 907,
+ "startOffset": 1139,
"endColumn": 83,
- "endOffset": 986
+ "endOffset": 1218
}
}
},
@@ -586,13 +182,13 @@
"endOffset": 1069
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 11,
+ "startLine": 13,
"startColumn": 4,
- "startOffset": 991,
+ "startOffset": 1223,
"endColumn": 82,
- "endOffset": 1069
+ "endOffset": 1301
}
}
},
@@ -605,13 +201,13 @@
"endOffset": 1155
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 12,
+ "startLine": 14,
"startColumn": 4,
- "startOffset": 1074,
+ "startOffset": 1306,
"endColumn": 85,
- "endOffset": 1155
+ "endOffset": 1387
}
}
},
@@ -624,13 +220,13 @@
"endOffset": 1259
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 13,
+ "startLine": 15,
"startColumn": 4,
- "startOffset": 1160,
+ "startOffset": 1392,
"endColumn": 103,
- "endOffset": 1259
+ "endOffset": 1491
}
}
},
@@ -643,13 +239,13 @@
"endOffset": 1372
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 14,
+ "startLine": 16,
"startColumn": 4,
- "startOffset": 1264,
+ "startOffset": 1496,
"endColumn": 112,
- "endOffset": 1372
+ "endOffset": 1604
}
}
},
@@ -662,13 +258,13 @@
"endOffset": 1478
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 15,
+ "startLine": 17,
"startColumn": 4,
- "startOffset": 1377,
+ "startOffset": 1609,
"endColumn": 105,
- "endOffset": 1478
+ "endOffset": 1710
}
}
},
@@ -681,13 +277,13 @@
"endOffset": 1583
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 16,
+ "startLine": 18,
"startColumn": 4,
- "startOffset": 1483,
+ "startOffset": 1715,
"endColumn": 104,
- "endOffset": 1583
+ "endOffset": 1815
}
}
},
@@ -700,13 +296,13 @@
"endOffset": 1696
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 17,
+ "startLine": 19,
"startColumn": 4,
- "startOffset": 1588,
+ "startOffset": 1820,
"endColumn": 112,
- "endOffset": 1696
+ "endOffset": 1928
}
}
},
@@ -719,13 +315,13 @@
"endOffset": 1803
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 18,
+ "startLine": 20,
"startColumn": 4,
- "startOffset": 1701,
+ "startOffset": 1933,
"endColumn": 106,
- "endOffset": 1803
+ "endOffset": 2035
}
}
},
@@ -738,13 +334,13 @@
"endOffset": 1926
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 19,
+ "startLine": 21,
"startColumn": 4,
- "startOffset": 1808,
+ "startOffset": 2040,
"endColumn": 122,
- "endOffset": 1926
+ "endOffset": 2158
}
}
},
@@ -757,13 +353,13 @@
"endOffset": 2023
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 20,
+ "startLine": 22,
"startColumn": 4,
- "startOffset": 1931,
+ "startOffset": 2163,
"endColumn": 96,
- "endOffset": 2023
+ "endOffset": 2255
}
}
},
@@ -772,36 +368,17 @@
"startLine": 21,
"startColumn": 4,
"startOffset": 2028,
- "endColumn": 88,
- "endOffset": 2112
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
- "position": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 2028,
- "endColumn": 88,
- "endOffset": 2112
- }
- }
- },
- {
- "to": {
- "startLine": 22,
- "startColumn": 4,
- "startOffset": 2117,
"endColumn": 100,
- "endOffset": 2213
+ "endOffset": 2124
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-hr\\values-hr.xml",
+ "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-hr\\values-hr.xml",
"position": {
- "startLine": 22,
+ "startLine": 23,
"startColumn": 4,
- "startOffset": 2117,
+ "startOffset": 2260,
"endColumn": 100,
- "endOffset": 2213
+ "endOffset": 2356
}
}
}
--
Gitblit v1.8.0