wangyijia_branch
master
# Conflicts: # src/notes/tool/DataUtils.java # src/notes/tool/TranslateUtils.java # src/notes/ui/BackgroundManager.java # src/notes/ui/CallRecordReceiver.java # src/notes/ui/CallRecordService.java # src/notes/ui/EncryptedFolderManager.java # src/notes/ui/ImageInsertHelper.java # src/notes/ui/MemoryBottleDialog.java # src/notes/ui/NoteEditActivity.java # src/notes/ui/NoteEditText.java # src/notes/ui/NotesListActivity.java # src/notes/ui/NotesListAdapter.java # src/notes/ui/NotesListItem.java # src/notes/ui/NotesPreferenceActivity.java # src/notes/ui/TrashManager.java # src/ui/NoteItemData.java
2d7da95482
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
2d7da95482into master 4 weeks ago2d7da95482.