development-history/proxy.git

			@@ -1,6 +1,6 @@
			[
			{
			"outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
			"outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
			"map": [
			{
			"to": {
			@@ -11,13 +11,13 @@
			"endOffset": 125
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 2,
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 55,
			"startOffset": 292,
			"endColumn": 74,
			"endOffset": 125
			"endOffset": 362
			}
			}
			},
			@@ -30,13 +30,13 @@
			"endOffset": 212
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 3,
			"startLine": 5,
			"startColumn": 4,
			"startOffset": 130,
			"startOffset": 367,
			"endColumn": 86,
			"endOffset": 212
			"endOffset": 449
			}
			}
			},
			@@ -45,125 +45,40 @@
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 217,
			"endLine": 8,
			"endLine": 6,
			"endColumn": 12,
			"endOffset": 548
			"endOffset": 393
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 4,
			"startLine": 6,
			"startColumn": 4,
			"startOffset": 217,
			"startOffset": 454,
			"endLine": 8,
			"endColumn": 12,
			"endOffset": 548
			"endOffset": 630
			}
			}
			},
			{
			"to": {
			"startLine": 9,
			"startLine": 7,
			"startColumn": 4,
			"startOffset": 553,
			"endLine": 13,
			"startOffset": 398,
			"endLine": 9,
			"endColumn": 12,
			"endOffset": 896
			"endOffset": 586
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 9,
			"startColumn": 4,
			"startOffset": 553,
			"endLine": 13,
			"startOffset": 635,
			"endLine": 11,
			"endColumn": 12,
			"endOffset": 896
			}
			}
			}
			]
			},
			{
			"outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
			"map": [
			{
			"to": {
			"startLine": 2,
			"startColumn": 4,
			"startOffset": 55,
			"endColumn": 74,
			"endOffset": 125
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 2,
			"startColumn": 4,
			"startOffset": 55,
			"endColumn": 74,
			"endOffset": 125
			}
			}
			},
			{
			"to": {
			"startLine": 3,
			"startColumn": 4,
			"startOffset": 130,
			"endColumn": 86,
			"endOffset": 212
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 3,
			"startColumn": 4,
			"startOffset": 130,
			"endColumn": 86,
			"endOffset": 212
			}
			}
			},
			{
			"to": {
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 217,
			"endLine": 8,
			"endColumn": 12,
			"endOffset": 548
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 217,
			"endLine": 8,
			"endColumn": 12,
			"endOffset": 548
			}
			}
			},
			{
			"to": {
			"startLine": 9,
			"startColumn": 4,
			"startOffset": 553,
			"endLine": 13,
			"endColumn": 12,
			"endOffset": 896
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v22\\values-v22.xml",
			"position": {
			"startLine": 9,
			"startColumn": 4,
			"startOffset": 553,
			"endLine": 13,
			"endColumn": 12,
			"endOffset": 896
			"endOffset": 823
			}
			}
			}