From e0d4157e98d4a4b383b703ca1264b931a290e71b Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 27 三月 2017 14:37:32 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-v21.json | 60 ++----------------------------------------------------------
1 files changed, 2 insertions(+), 58 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-v21.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-v21.json
index ffe0949..382969e 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-v21.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/drawable-v21.json
@@ -1,66 +1,10 @@
[
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\design_password_eye.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\design_password_eye.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_btn_colored_material.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\abc_btn_colored_material.xml"
- },
- {
"merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_btn_colored_material.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\abc_btn_colored_material.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\design_bottom_navigation_item_background.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\design_bottom_navigation_item_background.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_edit_text_material.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\abc_edit_text_material.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\notification_action_background.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\notification_action_background.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\design_password_eye.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\design_password_eye.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\avd_hide_password.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\avd_hide_password.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\design_bottom_navigation_item_background.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\design_bottom_navigation_item_background.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\avd_hide_password.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\avd_hide_password.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\avd_show_password.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\avd_show_password.xml"
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-v21\\abc_btn_colored_material.xml"
},
{
"merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_action_bar_item_background_material.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\abc_action_bar_item_background_material.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\avd_show_password.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\drawable-v21\\avd_show_password.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_action_bar_item_background_material.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\abc_action_bar_item_background_material.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\notification_action_background.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\notification_action_background.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21\\abc_edit_text_material.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\drawable-v21\\abc_edit_text_material.xml"
+ "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\drawable-v21\\abc_action_bar_item_background_material.xml"
}
]
\ No newline at end of file
--
Gitblit v1.8.0