Merge branch 'develop' of https://bdgit.educoder.net/m6wf5oeyl/MiNotes into wushuxian_branch
# Conflicts:
# .gitignore
# .idea/.gitignore
# doc/小米便签的代码标注.docx
# src/main/AndroidManifest.xml
# src/main/java/net/micode/notes/data/Contact.java
# src/main/java/net/micode/notes/data/Notes.java
# src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
# src/main/java/net/micode/notes/data/NotesProvider.java
# src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
# src/main/res/drawable-hdpi/edit_red.9.png
|
