Merge branch 'zhangxiaorui_branch' of https://bdgit.educoder.net/p6sb9rkmv/XiaoMiNotes into zhangxiaorui_branch
# Conflicts:
# doc/小米便签泛读报告.docx
# src/MainActivity.java
# src/net/micode/notes/data/Contact.java
# src/net/micode/notes/data/NotesDatabaseHelper.java
# src/net/micode/notes/gtask/data/MetaData.java
# src/net/micode/notes/gtask/data/Node.java
# src/net/micode/notes/gtask/data/SqlNote.java
# src/net/micode/notes/ui/AlarmReceiver.java
# src/net/micode/notes/ui/DateTimePickerDialog.java
# src/net/micode/notes/ui/FoldersListAdapter.java
# src/net/micode/notes/ui/NotesListAdapter.java
# src/ui/NoteEditActivity.java
# src/ui/NoteItemData.java
# src/ui/NotesListActivity.java
|