development-history/proxy.git

			@@ -1,6 +1,6 @@
			[
			{
			"outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
			"outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
			"map": [
			{
			"to": {
			@@ -11,13 +11,13 @@
			"endOffset": 185
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 2,
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 55,
			"startOffset": 297,
			"endColumn": 134,
			"endOffset": 185
			"endOffset": 427
			}
			}
			},
			@@ -26,17 +26,17 @@
			"startLine": 3,
			"startColumn": 4,
			"startOffset": 190,
			"endColumn": 134,
			"endOffset": 320
			"endColumn": 74,
			"endOffset": 260
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 3,
			"startLine": 7,
			"startColumn": 4,
			"startOffset": 190,
			"endColumn": 134,
			"endOffset": 320
			"startOffset": 669,
			"endColumn": 74,
			"endOffset": 739
			}
			}
			},
			@@ -44,18 +44,18 @@
			"to": {
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 325,
			"endColumn": 74,
			"endOffset": 395
			"startOffset": 265,
			"endColumn": 86,
			"endOffset": 347
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 4,
			"startLine": 8,
			"startColumn": 4,
			"startOffset": 325,
			"endColumn": 74,
			"endOffset": 395
			"startOffset": 744,
			"endColumn": 86,
			"endOffset": 826
			}
			}
			},
			@@ -63,373 +63,60 @@
			"to": {
			"startLine": 5,
			"startColumn": 4,
			"startOffset": 400,
			"endColumn": 86,
			"endOffset": 482
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 5,
			"startColumn": 4,
			"startOffset": 400,
			"endColumn": 86,
			"endOffset": 482
			}
			}
			},
			{
			"to": {
			"startLine": 6,
			"startColumn": 4,
			"startOffset": 487,
			"endLine": 18,
			"startOffset": 352,
			"endLine": 10,
			"endColumn": 12,
			"endOffset": 1272
			"endOffset": 675
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 6,
			"startLine": 9,
			"startColumn": 4,
			"startOffset": 487,
			"endLine": 18,
			"startOffset": 831,
			"endLine": 14,
			"endColumn": 12,
			"endOffset": 1272
			"endOffset": 1154
			}
			}
			},
			{
			"to": {
			"startLine": 19,
			"startLine": 11,
			"startColumn": 4,
			"startOffset": 1277,
			"endLine": 31,
			"startOffset": 680,
			"endLine": 16,
			"endColumn": 12,
			"endOffset": 2074
			"endOffset": 1015
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 19,
			"startLine": 15,
			"startColumn": 4,
			"startOffset": 1277,
			"endLine": 31,
			"startOffset": 1159,
			"endLine": 20,
			"endColumn": 12,
			"endOffset": 2074
			"endOffset": 1494
			}
			}
			},
			{
			"to": {
			"startLine": 32,
			"startLine": 17,
			"startColumn": 4,
			"startOffset": 2079,
			"endColumn": 126,
			"endOffset": 2201
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 32,
			"startColumn": 4,
			"startOffset": 2079,
			"endColumn": 126,
			"endOffset": 2201
			}
			}
			},
			{
			"to": {
			"startLine": 33,
			"startColumn": 4,
			"startOffset": 2206,
			"startOffset": 1020,
			"endColumn": 104,
			"endOffset": 2306
			"endOffset": 1120
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 33,
			"startLine": 23,
			"startColumn": 4,
			"startOffset": 2206,
			"startOffset": 1736,
			"endColumn": 104,
			"endOffset": 2306
			}
			}
			},
			{
			"to": {
			"startLine": 34,
			"startColumn": 4,
			"startOffset": 2311,
			"endColumn": 114,
			"endOffset": 2421
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 34,
			"startColumn": 4,
			"startOffset": 2311,
			"endColumn": 114,
			"endOffset": 2421
			}
			}
			},
			{
			"to": {
			"startLine": 35,
			"startColumn": 4,
			"startOffset": 2426,
			"endColumn": 106,
			"endOffset": 2528
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 35,
			"startColumn": 4,
			"startOffset": 2426,
			"endColumn": 106,
			"endOffset": 2528
			}
			}
			},
			{
			"to": {
			"startLine": 36,
			"startColumn": 4,
			"startOffset": 2533,
			"endColumn": 112,
			"endOffset": 2641
			},
			"from": {
			"file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 36,
			"startColumn": 4,
			"startOffset": 2533,
			"endColumn": 112,
			"endOffset": 2641
			}
			}
			}
			]
			},
			{
			"outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
			"map": [
			{
			"to": {
			"startLine": 2,
			"startColumn": 4,
			"startOffset": 55,
			"endColumn": 134,
			"endOffset": 185
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 2,
			"startColumn": 4,
			"startOffset": 55,
			"endColumn": 134,
			"endOffset": 185
			}
			}
			},
			{
			"to": {
			"startLine": 3,
			"startColumn": 4,
			"startOffset": 190,
			"endColumn": 134,
			"endOffset": 320
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 3,
			"startColumn": 4,
			"startOffset": 190,
			"endColumn": 134,
			"endOffset": 320
			}
			}
			},
			{
			"to": {
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 325,
			"endColumn": 74,
			"endOffset": 395
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 4,
			"startColumn": 4,
			"startOffset": 325,
			"endColumn": 74,
			"endOffset": 395
			}
			}
			},
			{
			"to": {
			"startLine": 5,
			"startColumn": 4,
			"startOffset": 400,
			"endColumn": 86,
			"endOffset": 482
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 5,
			"startColumn": 4,
			"startOffset": 400,
			"endColumn": 86,
			"endOffset": 482
			}
			}
			},
			{
			"to": {
			"startLine": 6,
			"startColumn": 4,
			"startOffset": 487,
			"endLine": 18,
			"endColumn": 12,
			"endOffset": 1272
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 6,
			"startColumn": 4,
			"startOffset": 487,
			"endLine": 18,
			"endColumn": 12,
			"endOffset": 1272
			}
			}
			},
			{
			"to": {
			"startLine": 19,
			"startColumn": 4,
			"startOffset": 1277,
			"endLine": 31,
			"endColumn": 12,
			"endOffset": 2074
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 19,
			"startColumn": 4,
			"startOffset": 1277,
			"endLine": 31,
			"endColumn": 12,
			"endOffset": 2074
			}
			}
			},
			{
			"to": {
			"startLine": 32,
			"startColumn": 4,
			"startOffset": 2079,
			"endColumn": 126,
			"endOffset": 2201
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 32,
			"startColumn": 4,
			"startOffset": 2079,
			"endColumn": 126,
			"endOffset": 2201
			}
			}
			},
			{
			"to": {
			"startLine": 33,
			"startColumn": 4,
			"startOffset": 2206,
			"endColumn": 104,
			"endOffset": 2306
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 33,
			"startColumn": 4,
			"startOffset": 2206,
			"endColumn": 104,
			"endOffset": 2306
			}
			}
			},
			{
			"to": {
			"startLine": 34,
			"startColumn": 4,
			"startOffset": 2311,
			"endColumn": 114,
			"endOffset": 2421
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 34,
			"startColumn": 4,
			"startOffset": 2311,
			"endColumn": 114,
			"endOffset": 2421
			}
			}
			},
			{
			"to": {
			"startLine": 35,
			"startColumn": 4,
			"startOffset": 2426,
			"endColumn": 106,
			"endOffset": 2528
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 35,
			"startColumn": 4,
			"startOffset": 2426,
			"endColumn": 106,
			"endOffset": 2528
			}
			}
			},
			{
			"to": {
			"startLine": 36,
			"startColumn": 4,
			"startOffset": 2533,
			"endColumn": 112,
			"endOffset": 2641
			},
			"from": {
			"file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v23\\values-v23.xml",
			"position": {
			"startLine": 36,
			"startColumn": 4,
			"startOffset": 2533,
			"endColumn": 112,
			"endOffset": 2641
			"endOffset": 1836
			}
			}
			}