睿美四控
This commit is contained in:
+8
-8
@@ -307,14 +307,14 @@
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f414.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f414.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f688.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f688.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f649.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f649.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f688.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f688.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f63d.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f63d.png"
|
||||
@@ -423,14 +423,14 @@
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f685.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f685.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f62c.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f62c.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f640.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f640.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f62c.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f62c.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f471.png",
|
||||
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f471.png"
|
||||
|
||||
@@ -143,14 +143,14 @@
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_progressbar.xml",
|
||||
"source": "C:\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_progressbar.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_followed_user_layout.xml",
|
||||
"source": "C:\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_followed_user_layout.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_base_loading_view.xml",
|
||||
"source": "C:\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_base_loading_view.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_followed_user_layout.xml",
|
||||
"source": "C:\\ifish\\umeng_community_library\\res\\layout\\umeng_comm_followed_user_layout.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_images_gv.xml",
|
||||
"source": "C:\\ifish\\umeng_community_library\\res\\layout\\umeng_simplify_images_gv.xml"
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:11:02 CST 2018
|
||||
#Tue Apr 24 16:46:06 CST 2018
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f625.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f625.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\dibiao.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\dibiao.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_favourite_button.xml=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_favourite_button.xml
|
||||
@@ -308,8 +308,8 @@ C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_nearby_user.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_nearby_user.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f432.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f432.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_comment_comment_selector.xml=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_comment_comment_selector.xml
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_retangle.xml=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_retangle.xml
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\zuobai.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\zuobai.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable\\umeng_comm_retangle.xml=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\umeng_comm_retangle.xml
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\xiaolian.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\xiaolian.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_photo.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\umeng_comm_photo.png
|
||||
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f604.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-nodpi-v4\\emoji_1f604.png
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:10:57 CST 2018
|
||||
#Tue Apr 24 16:45:58 CST 2018
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1f691.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f691.png
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_setting_pressed.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_setting_pressed.png
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1f63b.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f63b.png
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:11:00 CST 2018
|
||||
#Tue Apr 24 16:46:02 CST 2018
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1f691.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f691.png
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_setting_pressed.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\umeng_comm_setting_pressed.png
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1f63b.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\debug\\res\\drawable-nodpi-v4\\emoji_1f63b.png
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:10:23 CST 2018
|
||||
#Tue Apr 24 16:45:08 CST 2018
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1f691.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f691.png
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-xhdpi\\umeng_comm_setting_pressed.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_setting_pressed.png
|
||||
C\:\\ifish\\umeng_community_library\\res\\drawable-nodpi\\emoji_1f63b.png=C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f63b.png
|
||||
|
||||
Reference in New Issue
Block a user