Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom into sujiazheng_branch
# Conflicts:
# src/Notes-master/app/src/main/java/net/micode/notes/MainActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/command/Command.java
# src/Notes-master/app/src/main/java/net/micode/notes/command/TextChangeCommand.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
# src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
# src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
# src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
# src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
# src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
# src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
# src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
# src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
|
Tom