You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ShakeJ96 f5e2cb6ae6 Merge remote-tracking branch 'origin/master' ... # Conflicts: # .gradle/7.0.2/executionHistory/executionHistory.bin # .gradle/7.0.2/executionHistory/executionHistory.lock # .gradle/7.0.2/fileHashes/fileHashes.bin # .gradle/7.0.2/fileHashes/fileHashes.lock # .gradle/7.0.2/fileHashes/resourceHashesCache.bin # .gradle/7.0.2/javaCompile/classAnalysis.bin # .gradle/7.0.2/javaCompile/jarAnalysis.bin # .gradle/7.0.2/javaCompile/javaCompile.lock # .gradle/7.0.2/javaCompile/taskHistory.bin # .gradle/buildOutputCleanup/buildOutputCleanup.lock # app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar # app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json # app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin # app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin # app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin # app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin # app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin # app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin # app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # app/build/intermediates/dex_archive_input_jar_hashes/debug/out # app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json # app/build/intermediates/incremental/debug-mergeJavaRes/merge-state # app/build/intermediates/incremental/mergeDebugAssets/merger.xml # app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties # app/build/intermediates/incremental/mergeDebugResources/merger.xml # app/build/intermediates/incremental/mergeDebugShaders/merger.xml # app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivitySplashBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditListItemBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class # app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class # app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class # app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class # app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class # app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat # app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_hutao.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_keli.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_mi.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_mi1.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_op_start.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat # app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat # app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat # app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat # app/build/intermediates/merged_res/debug/layout_acticity_word.xml.flat # app/build/intermediates/merged_res/debug/layout_activity_splash.xml.flat # app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat # app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat # app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat # app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat # app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat # app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat # app/build/intermediates/merged_res/debug/layout_note_item.xml.flat # app/build/intermediates/merged_res/debug/layout_note_list.xml.flat # app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat # app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat # app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat # app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat # app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat # app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat # app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat # app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat # app/build/intermediates/merged_res/debug/menu_note_list.xml.flat # app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat # app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat # app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat # app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat # app/build/intermediates/merged_res/debug/raw_introduction.flat # app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat # app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat # app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat # app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat # app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat # app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat # app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat # app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat # app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat # app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat # app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat # app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat # app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat # app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat # app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat # app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat # app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat # app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat # app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat # app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat # app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat # app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat # app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat # app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat # app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat # app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat # app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat # app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat # app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat # app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat # app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat # app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat # app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat # app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat # app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat # app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat # app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat # app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat # app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat # app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat # app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat # app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat # app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat # app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat # app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat # app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat # app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat # app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat # app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat # app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat # app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat # app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat # app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat # app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat # app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat # app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat # app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat # app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat # app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat # app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat # app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat # app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat # app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat # app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat # app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat # app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat # app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat # app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat # app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat # app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat # app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat # app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat # app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat # app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat # app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat # app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat # app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat # app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat # app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat # app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat # app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat # app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat # app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat # app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat # app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat # app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat # app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat # app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat # app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat # app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat # app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat # app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat # app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat # app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat # app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat # app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat # app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat # app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat # app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat # app/build/intermediates/merged_res/debug/values-w1240dp-v13_values-w1240dp-v13.arsc.flat # app/build/intermediates/merged_res/debug/values-w600dp-v13_values-w600dp-v13.arsc.flat # app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat # app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat # app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat # app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat # app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat # app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat # app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat # app/build/intermediates/merged_res/debug/values_values.arsc.flat # app/build/intermediates/merged_res/debug/xml_preferences.xml.flat # app/build/intermediates/merged_res/debug/xml_searchable.xml.flat # app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat # app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w1240dp-v13.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w600dp-v13.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json # app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json # app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/ActivitySplashBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/DatetimePickerBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/FolderListItemBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteEditBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteEditListItemBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteItemBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListDropdownMenuBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget2xBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget4xBinding.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex # app/build/intermediates/runtime_symbol_list/debug/R.txt # app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt # app/build/outputs/apk/debug/app-debug.apk # app/build/outputs/logs/manifest-merger-debug-report.txt # local.properties		2 years ago
..
source-classes-mapping.txt	Merge remote-tracking branch 'origin/master'	2 years ago