From 8dd085f78e4bcfbc89ede104108cd03053183865 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 15:37:00 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable.json | 280 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 200 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..11114a7 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,282 @@
[
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\rounded_textview.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\rounded_textview.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u117.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u117.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_dark.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u251.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u251.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u325.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u325.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_search_et.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_search_et.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u51.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u51.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_colored_material.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_colored_material.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\rectangle_textview.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\rectangle_textview.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u208.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u208.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_5.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_5.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u202.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u202.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u321.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u321.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\pulltorefresh_down_arrow.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\pulltorefresh_down_arrow.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\bg_shadow.9.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\bg_shadow.9.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u45.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u45.png"
},
{
- "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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\main_btn_bcg.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\main_btn_bcg.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\design_fab_background.xml",
+ "source": "F:\\workspace2\\VisitFace\\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\\tab_main_6.xml",
- "source": "D:\\work\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_6.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\rounded_corners.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\rounded_corners.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_6.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_6.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_full_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_3.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_3.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_0.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_0.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\surface_info_bcg.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\surface_info_bcg.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_check_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_radio_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\one_bottom_tab_bcg.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\one_bottom_tab_bcg.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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml",
+ "source": "F:\\workspace2\\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\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_spinner_textfield_background_material.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\rectangle.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\rectangle.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\circle.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\circle.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_2.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_2.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u68.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u68.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u38.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u38.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u158.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u158.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_1.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_1.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_btn_default_mtrl_shape.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_switch_thumb_material.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_item_background_holo_light.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_light.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_dialog_material_background_light.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u194.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u194.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u216.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u216.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u252.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u252.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\normal_choose_bcg.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\normal_choose_bcg.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u241.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u241.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u249.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u249.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u233.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u233.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tab_main_4.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\tab_main_4.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u222.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u222.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u36.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u36.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_rb_left.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_rb_left.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u39.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u39.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\pulltorefresh_up_arrow.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\pulltorefresh_up_arrow.png"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
+ "source": "F:\\workspace2\\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": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\design_snackbar_background.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\drawable\\design_snackbar_background.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\visitor_register_rb_right.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\visitor_register_rb_right.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_dark.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable\\abc_list_selector_holo_dark.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\card_bcg.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\card_bcg.xml"
+ },
+ {
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\u41.png",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\drawable\\u41.png"
}
]
\ No newline at end of file
--
Gitblit v1.8.0