From 789b7ff1e420aff8bca618ea1705eb20f4ad0315 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 15:54:44 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-xxxhdpi.json | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-xxxhdpi.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-xxxhdpi.json
index 7f9c180..ebc7392 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-xxxhdpi.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-xxxhdpi.json
@@ -1,86 +1,86 @@
[
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_clear_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_clear_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_tab_indicator_mtrl_alpha.9.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_tab_indicator_mtrl_alpha.9.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00012.9.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00012.9.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_paste_mtrl_am_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_paste_mtrl_am_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_switch_track_mtrl_alpha.9.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_switch_track_mtrl_alpha.9.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_selectall_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_selectall_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_000.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_000.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_clear_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_clear_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_ab_back_mtrl_am_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_ab_back_mtrl_am_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_cut_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_cut_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_copy_mtrl_am_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_copy_mtrl_am_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_000.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_000.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_spinner_mtrl_am_alpha.9.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_spinner_mtrl_am_alpha.9.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_000.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_000.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_000.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_000.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_000.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_000.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00001.9.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00001.9.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_015.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_015.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_paste_mtrl_am_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_paste_mtrl_am_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_share_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_share_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_015.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_015.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_voice_search_api_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_voice_search_api_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_tab_indicator_mtrl_alpha.9.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_tab_indicator_mtrl_alpha.9.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_moreoverflow_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_moreoverflow_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_moreoverflow_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_moreoverflow_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00001.9.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00001.9.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_voice_search_api_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_voice_search_api_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_copy_mtrl_am_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_copy_mtrl_am_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_selectall_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_selectall_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_ab_back_mtrl_am_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_ab_back_mtrl_am_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_000.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_000.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_search_api_mtrl_alpha.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_search_api_mtrl_alpha.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_share_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_share_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_015.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_radio_to_on_mtrl_015.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_menu_cut_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_menu_cut_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_switch_track_mtrl_alpha.9.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_switch_track_mtrl_alpha.9.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_005.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_005.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_005.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_scrubber_control_to_pressed_mtrl_005.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_ic_search_api_mtrl_alpha.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_ic_search_api_mtrl_alpha.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_spinner_mtrl_am_alpha.9.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_spinner_mtrl_am_alpha.9.png"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_015.png",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_check_to_on_mtrl_015.png"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00012.9.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-xxxhdpi\\abc_btn_switch_to_on_mtrl_00012.9.png"
}
]
\ No newline at end of file
--
Gitblit v1.8.0