Merge branch 'luogang_branch' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead
# Conflicts:
# doc/小米便签泛读报告.docx
# src/Notes-master/src/net/micode/notes/data/Contact.java
# src/Notes-master/src/net/micode/notes/data/Notes.java
# src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
# src/Notes-master/src/net/micode/notes/data/NotesProvider.java
# src/Notes-master/src/net/micode/notes/model/Note.java
# src/Notes-master/src/net/micode/notes/model/WorkingNote.java
# src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
# src/Notes-master/src/net/micode/notes/tool/DataUtils.java
# src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
# src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
# src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
# src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
# src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
# src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
# src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
# src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java
# src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
# src/Notes-master/src/net/micode/notes/ui/NoteEditText.java
# src/Notes-master/src/net/micode/notes/ui/NoteItemData.java
# src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
# src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
# src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
# src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
|
