From 567bf59de1750c46026b7133f6d808e4ac0dac69 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 27 三月 2017 16:30:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable.json | 160 ++++++++++++++++++++++++++--------------------------
1 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable.json
index 7fcbe6d..92a3fc9 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable.json
@@ -1,162 +1,162 @@
[
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_spinner_textfield_background_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\design_fab_background.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\drawable\\design_fab_background.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\normal_choose_bcg.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\normal_choose_bcg.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\normal_choose_bcg.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\normal_choose_bcg.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_default_mtrl_shape.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_full_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_ratingbar_full_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_4.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_4.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_dark.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_item_background_holo_dark.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_light.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_dialog_material_background_light.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\card_bcg.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\card_bcg.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\main_btn_bcg.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\main_btn_bcg.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_textfield_search_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_holo_light.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_1.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_1.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_dark.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_holo_dark.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_rb_right.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_rb_right.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_default_mtrl_shape.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_seekbar_track_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_textfield_search_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_2.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_2.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_cab_background_internal_bg.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_5.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_5.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_rb_left.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_rb_left.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_seekbar_thumb_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_dark.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_item_background_holo_dark.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_search_et.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_search_et.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_edit_text_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_text_cursor_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_text_cursor_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_switch_thumb_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\design_snackbar_background.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\drawable\\design_snackbar_background.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_dialog_material_background_dark.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_item_background_holo_light.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_rb_left.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_rb_left.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\card_bcg.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\card_bcg.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_tab_indicator_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_1.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_1.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_check_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_check_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_4.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_4.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_edit_text_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_switch_thumb_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\one_bottom_tab_bcg.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\one_bottom_tab_bcg.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\one_bottom_tab_bcg.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\one_bottom_tab_bcg.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_search_et.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_search_et.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_cab_background_top_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_rb_right.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_rb_right.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_0.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_0.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_borderless_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_6.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_6.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_seekbar_track_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_3.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_3.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_3.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_3.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_check_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_check_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_holo_light.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_seekbar_thumb_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_borderless_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_0.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_0.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_dark.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_holo_dark.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_radio_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_radio_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_full_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_ratingbar_full_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_2.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_2.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\surface_info_bcg.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\surface_info_bcg.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_5.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_5.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\design_fab_background.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\drawable\\design_fab_background.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_tab_indicator_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_light.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_dialog_material_background_light.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\surface_info_bcg.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\surface_info_bcg.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_item_background_holo_light.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_6.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_6.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\design_snackbar_background.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\drawable\\design_snackbar_background.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_cab_background_internal_bg.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_cab_background_top_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\main_btn_bcg.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\main_btn_bcg.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_spinner_textfield_background_material.xml"
},
{
- "merged": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_radio_material.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_radio_material.xml"
+ "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml",
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_dialog_material_background_dark.xml"
}
]
\ No newline at end of file
--
Gitblit v1.8.0