From 8f003b35b74d5e84db192376b49404ae7666aa01 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:28:24 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/anim.json | 112 ++++++++++++++++++--------------------------------------
1 files changed, 36 insertions(+), 76 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/anim.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/anim.json
index bbfe176..f65f193 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/anim.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/single/anim.json
@@ -1,114 +1,74 @@
[
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_in.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_snackbar_in.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\slide_down.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\anim\\slide_down.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_out_bottom.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_out_bottom.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_in.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_fade_in.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_in.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_snackbar_in.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_out.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\anim\\design_snackbar_out.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_out.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_snackbar_out.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_grow_fade_in_from_bottom.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_grow_fade_in_from_bottom.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_top.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_in_top.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_out_top.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_slide_out_top.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_out_top.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_out_top.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_fab_out.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\anim\\design_fab_out.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_fab_in.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_fab_in.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\slide_up.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\anim\\slide_up.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_popup_enter.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_popup_enter.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\fade_out.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\anim\\fade_out.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_shrink_fade_out_from_bottom.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_shrink_fade_out_from_bottom.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_popup_enter.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_popup_enter.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_grow_fade_in_from_bottom.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_grow_fade_in_from_bottom.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_out.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_fade_out.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_fab_in.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_fab_in.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_top.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_slide_in_top.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_top.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_in_top.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_out_bottom.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_slide_out_bottom.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_out_bottom.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_out_bottom.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\fade_in.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\anim\\fade_in.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_out.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_fade_out.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_shrink_fade_out_from_bottom.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_shrink_fade_out_from_bottom.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_fab_out.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_fab_out.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_popup_exit.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_popup_exit.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_fab_out.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_fab_out.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_bottom.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\anim\\abc_slide_in_bottom.xml"
},
{
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_out.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\anim\\design_snackbar_out.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_fab_in.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\anim\\design_fab_in.xml"
},
{
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_out_top.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_out_top.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_in.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_fade_in.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_out.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_fade_out.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_shrink_fade_out_from_bottom.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_shrink_fade_out_from_bottom.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_popup_exit.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_popup_exit.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_popup_enter.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_popup_enter.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_fade_in.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_fade_in.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_grow_fade_in_from_bottom.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_grow_fade_in_from_bottom.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_popup_exit.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_popup_exit.xml"
- },
- {
- "merged": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_bottom.xml",
- "source": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_in_bottom.xml"
- },
- {
- "merged": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_bottom.xml",
- "source": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\anim\\abc_slide_in_bottom.xml"
+ "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\anim\\design_snackbar_in.xml",
+ "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\anim\\design_snackbar_in.xml"
}
]
\ No newline at end of file
--
Gitblit v1.8.0