Merge branch 'wjy' into dev
# Conflicts:
# MiNote/src/net/micode/notes/data/Contact.java
# MiNote/src/net/micode/notes/data/Notes.java
# MiNote/src/net/micode/notes/data/NotesDatabaseHelper.java
# MiNote/src/net/micode/notes/data/NotesProvider.java
# MiNote/src/net/micode/notes/ui/AlarmAlertActivity.java
# MiNote/src/net/micode/notes/ui/AlarmInitReceiver.java
# MiNote/src/net/micode/notes/ui/AlarmReceiver.java
# MiNote/src/net/micode/notes/ui/DateTimePicker.java
# MiNote/src/net/micode/notes/ui/DateTimePickerDialog.java
# MiNote/src/net/micode/notes/ui/DropdownMenu.java
# MiNote/src/net/micode/notes/ui/FoldersListAdapter.java
# MiNote/src/net/micode/notes/ui/NoteEditActivity.java
# MiNote/src/net/micode/notes/ui/NoteItemData.java
# MiNote/src/net/micode/notes/ui/NotesListAdapter.java
# MiNote/src/net/micode/notes/ui/NotesListItem.java
# MiNote/src/net/micode/notes/ui/NotesPreferenceActivity.java
|
王聚英
孙祖凯