src/Notes-master2/app/build/intermediates/blame/res/debug/single/debug.json

@@ -1,12 +1,9 @@
 [
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
     },
@@ -19,13 +16,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list.xml"
     },
@@ -34,19 +28,14 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit.xml"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_edit.xml"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
     },
@@ -55,13 +44,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml"
     },
@@ -78,29 +64,22 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml"
     },
@@ -113,8 +92,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
     },
@@ -123,7 +100,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
     },
@@ -132,24 +108,18 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\add_account_text.xml"
     },
@@ -158,13 +128,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_item.xml"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
     },
@@ -185,13 +152,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
     },
@@ -200,8 +164,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
     },
@@ -214,7 +176,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
     },
@@ -231,13 +192,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
     },
     {
-<<<<<<< HEAD
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_secret_folder.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_secret_folder.xml"
-    },
-    {
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
     },
@@ -246,161 +200,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
     },
     {
-<<<<<<< HEAD
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_play_record.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\play_record.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
-    },
-    {
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
     },
@@ -413,34 +212,24 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
     },
     {
-<<<<<<< HEAD
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
     },
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
     },
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
     },
     {
-<<<<<<< HEAD
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
     },
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
     },
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat",
@@ -455,45 +244,30 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
     },
     {
-<<<<<<< HEAD
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
-    },
-    {
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_record_activity.xml.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\record_activity.xml"
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml"
     },
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
     },
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
     },
@@ -502,24 +276,18 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\raw\\introduction"
     },
@@ -528,13 +296,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml"
     },
@@ -547,8 +312,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
     },
@@ -557,13 +320,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
     },
@@ -572,7 +332,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
     },
@@ -589,13 +348,10 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
     },
     {
-<<<<<<< HEAD
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
     },
     {
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
     },
@@ -604,10 +360,6 @@
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
     },
     {
-<<<<<<< HEAD
-        "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat",
-        "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
-=======
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
     },
@@ -626,6 +378,5 @@
     {
         "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
         "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml"
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
     }
 ]

src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -4,13 +4,9 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
-<<<<<<< HEAD
-    <uses-sdk android:minSdkVersion="14" />
-=======
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="22" />
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- -write on SD card -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- -快捷方式 -->
@@ -21,21 +17,11 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <!-- -获取账户 -->
     <uses-permission android:name="android.permission.USE_CREDENTIALS" /> <!-- -使用证书 -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-<<<<<<< HEAD
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-<<<<<<< HEAD
-        android:label="@string/app_name"
-        android:testOnly="true" >
-=======
         android:label="@string/app_name" >
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -75,12 +61,6 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-<<<<<<< HEAD
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT" />
-            </intent-filter>
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 
             <meta-data
                 android:name="android.app.searchable"
@@ -149,18 +129,6 @@
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".ui.NoteEditActivity" />
-<<<<<<< HEAD
-
-        <activity
-            android:name="net.micode.notes.ui.RecordActivity"
-            android:label="Notes"
-            android:launchMode="standard" />
-        <activity
-            android:name="net.micode.notes.tool.PlayRecord"
-            android:label="Notes"
-            android:launchMode="standard" />
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
     </application>
 
 </manifest>

src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,104 +1,3 @@
-<<<<<<< HEAD
-#Fri Nov 27 08:46:20 CST 2020
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_secret_folder.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_secret_folder.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\play_record.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_play_record.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\raw\\introduction=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\record_activity.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_record_activity.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat
-E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat
-=======
 #Mon Oct 12 08:55:37 CST 2020
 E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat
 E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat
@@ -195,4 +94,3 @@ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dateti
 E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat
 E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
 E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc

src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#Fri Nov 27 08:46:26 CST 2020
-=======
 #Fri Oct 16 08:44:26 CST 2020
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 base.0=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -5,13 +5,9 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
-<<<<<<< HEAD
-    <uses-sdk android:minSdkVersion="14" />
-=======
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="22" />
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- -write on SD card -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- -快捷方式 -->
@@ -22,21 +18,11 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <!-- -获取账户 -->
     <uses-permission android:name="android.permission.USE_CREDENTIALS" /> <!-- -使用证书 -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-<<<<<<< HEAD
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-<<<<<<< HEAD
-        android:label="@string/app_name"
-        android:testOnly="true" >
-=======
         android:label="@string/app_name" >
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -76,12 +62,6 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-<<<<<<< HEAD
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT" />
-            </intent-filter>
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
 
             <meta-data
                 android:name="android.app.searchable"
@@ -150,18 +130,6 @@
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".ui.NoteEditActivity" />
-<<<<<<< HEAD
-
-        <activity
-            android:name="net.micode.notes.ui.RecordActivity"
-            android:label="Notes"
-            android:launchMode="standard" />
-        <activity
-            android:name="net.micode.notes.tool.PlayRecord"
-            android:label="Notes"
-            android:launchMode="standard" />
-=======
->>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
     </application>
 
 </manifest>