development-history/proxy.git

			@@ -1,6 +1,6 @@
			[
			{
			"outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v14\\values-v14.xml",
			"outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v14\\values-v14.xml",
			"map": [
			{
			"to": {
			@@ -12,14 +12,14 @@
			"endOffset": 326
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 2,
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 55,
			"endLine": 6,
			"startOffset": 297,
			"endLine": 8,
			"endColumn": 12,
			"endOffset": 326
			"endOffset": 568
			}
			}
			},
			@@ -32,13 +32,13 @@
			"endOffset": 397
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 7,
			"startLine": 11,
			"startColumn": 4,
			"startOffset": 331,
			"startOffset": 810,
			"endColumn": 70,
			"endOffset": 397
			"endOffset": 876
			}
			}
			},
			@@ -51,13 +51,13 @@
			"endOffset": 480
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 8,
			"startLine": 12,
			"startColumn": 4,
			"startOffset": 402,
			"startOffset": 881,
			"endColumn": 82,
			"endOffset": 480
			"endOffset": 959
			}
			}
			},
			@@ -71,14 +71,14 @@
			"endOffset": 890
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 9,
			"startLine": 13,
			"startColumn": 4,
			"startOffset": 485,
			"endLine": 14,
			"startOffset": 964,
			"endLine": 18,
			"endColumn": 12,
			"endOffset": 890
			"endOffset": 1369
			}
			}
			},
			@@ -92,14 +92,14 @@
			"endOffset": 1312
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 15,
			"startLine": 19,
			"startColumn": 4,
			"startOffset": 895,
			"endLine": 20,
			"startOffset": 1374,
			"endLine": 24,
			"endColumn": 12,
			"endOffset": 1312
			"endOffset": 1791
			}
			}
			},
			@@ -112,13 +112,13 @@
			"endOffset": 1432
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 21,
			"startLine": 27,
			"startColumn": 4,
			"startOffset": 1317,
			"startOffset": 2028,
			"endColumn": 119,
			"endOffset": 1432
			"endOffset": 2143
			}
			}
			},
			@@ -127,17 +127,17 @@
			"startLine": 22,
			"startColumn": 4,
			"startOffset": 1437,
			"endColumn": 131,
			"endOffset": 1564
			"endColumn": 62,
			"endOffset": 1495
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 22,
			"startLine": 28,
			"startColumn": 4,
			"startOffset": 1437,
			"endColumn": 131,
			"endOffset": 1564
			"startOffset": 2148,
			"endColumn": 62,
			"endOffset": 2206
			}
			}
			},
			@@ -145,337 +145,58 @@
			"to": {
			"startLine": 23,
			"startColumn": 4,
			"startOffset": 1569,
			"endColumn": 119,
			"endOffset": 1684
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 23,
			"startColumn": 4,
			"startOffset": 1569,
			"endColumn": 119,
			"endOffset": 1684
			}
			}
			},
			{
			"to": {
			"startLine": 24,
			"startColumn": 4,
			"startOffset": 1689,
			"endColumn": 62,
			"endOffset": 1747
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 24,
			"startColumn": 4,
			"startOffset": 1689,
			"endColumn": 62,
			"endOffset": 1747
			}
			}
			},
			{
			"to": {
			"startLine": 25,
			"startColumn": 4,
			"startOffset": 1752,
			"endLine": 27,
			"startOffset": 1500,
			"endLine": 25,
			"endColumn": 12,
			"endOffset": 1901
			"endOffset": 1649
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 25,
			"startColumn": 4,
			"startOffset": 1752,
			"endLine": 27,
			"endColumn": 12,
			"endOffset": 1901
			}
			}
			},
			{
			"to": {
			"startLine": 28,
			"startColumn": 4,
			"startOffset": 1906,
			"endColumn": 62,
			"endOffset": 1964
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 28,
			"startColumn": 4,
			"startOffset": 1906,
			"endColumn": 62,
			"endOffset": 1964
			}
			}
			},
			{
			"to": {
			"startLine": 29,
			"startColumn": 4,
			"startOffset": 1969,
			"endColumn": 131,
			"endOffset": 2096
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 29,
			"startColumn": 4,
			"startOffset": 1969,
			"endColumn": 131,
			"endOffset": 2096
			}
			}
			}
			]
			},
			{
			"outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v14\\values-v14.xml",
			"map": [
			{
			"to": {
			"startLine": 2,
			"startColumn": 4,
			"startOffset": 55,
			"endLine": 6,
			"endColumn": 12,
			"endOffset": 326
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 2,
			"startColumn": 4,
			"startOffset": 55,
			"endLine": 6,
			"startOffset": 2211,
			"endLine": 31,
			"endColumn": 12,
			"endOffset": 326
			"endOffset": 2360
			}
			}
			},
			{
			"to": {
			"startLine": 7,
			"startLine": 26,
			"startColumn": 4,
			"startOffset": 331,
			"endColumn": 70,
			"endOffset": 397
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 7,
			"startColumn": 4,
			"startOffset": 331,
			"endColumn": 70,
			"endOffset": 397
			}
			}
			},
			{
			"to": {
			"startLine": 8,
			"startColumn": 4,
			"startOffset": 402,
			"endColumn": 82,
			"endOffset": 480
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 8,
			"startColumn": 4,
			"startOffset": 402,
			"endColumn": 82,
			"endOffset": 480
			}
			}
			},
			{
			"to": {
			"startLine": 9,
			"startColumn": 4,
			"startOffset": 485,
			"endLine": 14,
			"endColumn": 12,
			"endOffset": 890
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 9,
			"startColumn": 4,
			"startOffset": 485,
			"endLine": 14,
			"endColumn": 12,
			"endOffset": 890
			}
			}
			},
			{
			"to": {
			"startLine": 15,
			"startColumn": 4,
			"startOffset": 895,
			"endLine": 20,
			"endColumn": 12,
			"endOffset": 1312
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 15,
			"startColumn": 4,
			"startOffset": 895,
			"endLine": 20,
			"endColumn": 12,
			"endOffset": 1312
			}
			}
			},
			{
			"to": {
			"startLine": 21,
			"startColumn": 4,
			"startOffset": 1317,
			"endColumn": 119,
			"endOffset": 1432
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 21,
			"startColumn": 4,
			"startOffset": 1317,
			"endColumn": 119,
			"endOffset": 1432
			}
			}
			},
			{
			"to": {
			"startLine": 22,
			"startColumn": 4,
			"startOffset": 1437,
			"endColumn": 131,
			"endOffset": 1564
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 22,
			"startColumn": 4,
			"startOffset": 1437,
			"endColumn": 131,
			"endOffset": 1564
			}
			}
			},
			{
			"to": {
			"startLine": 23,
			"startColumn": 4,
			"startOffset": 1569,
			"endColumn": 119,
			"endOffset": 1684
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 23,
			"startColumn": 4,
			"startOffset": 1569,
			"endColumn": 119,
			"endOffset": 1684
			}
			}
			},
			{
			"to": {
			"startLine": 24,
			"startColumn": 4,
			"startOffset": 1689,
			"startOffset": 1654,
			"endColumn": 62,
			"endOffset": 1747
			"endOffset": 1712
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 24,
			"startLine": 32,
			"startColumn": 4,
			"startOffset": 1689,
			"startOffset": 2365,
			"endColumn": 62,
			"endOffset": 1747
			"endOffset": 2423
			}
			}
			},
			{
			"to": {
			"startLine": 25,
			"startLine": 27,
			"startColumn": 4,
			"startOffset": 1752,
			"endLine": 27,
			"endColumn": 12,
			"endOffset": 1901
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 25,
			"startColumn": 4,
			"startOffset": 1752,
			"endLine": 27,
			"endColumn": 12,
			"endOffset": 1901
			}
			}
			},
			{
			"to": {
			"startLine": 28,
			"startColumn": 4,
			"startOffset": 1906,
			"endColumn": 62,
			"endOffset": 1964
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 28,
			"startColumn": 4,
			"startOffset": 1906,
			"endColumn": 62,
			"endOffset": 1964
			}
			}
			},
			{
			"to": {
			"startLine": 29,
			"startColumn": 4,
			"startOffset": 1969,
			"startOffset": 1717,
			"endColumn": 131,
			"endOffset": 2096
			"endOffset": 1844
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v14\\values-v14.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v14\\values-v14.xml",
			"position": {
			"startLine": 29,
			"startLine": 33,
			"startColumn": 4,
			"startOffset": 1969,
			"startOffset": 2428,
			"endColumn": 131,
			"endOffset": 2096
			"endOffset": 2555
			}
			}
			}