Merge branch 'temp' into develop
# Conflicts:
# doc/小米便签开源代码泛读报告.docx
# src/notes/data/Contact.java
# src/notes/data/Notes.java
# src/notes/data/NotesDatabaseHelper.java
# src/notes/data/NotesProvider.java
# src/notes/gtask/data/Node.java
# src/notes/gtask/data/SqlData.java
# src/notes/gtask/data/SqlNote.java
# src/notes/gtask/data/Task.java
# src/notes/gtask/data/TaskList.java
# src/notes/gtask/remote/GTaskASyncTask.java
# src/notes/gtask/remote/GTaskClient.java
# src/notes/gtask/remote/GTaskManager.java
# src/notes/gtask/remote/GTaskSyncService.java
# src/notes/model/Note.java
# src/notes/model/WorkingNote.java
# src/notes/tool/BackupUtils.java
# src/notes/tool/DataUtils.java
# src/notes/tool/ResourceParser.java
# src/notes/ui/AlarmAlertActivity.java
# src/notes/ui/AlarmInitReceiver.java
# src/notes/ui/AlarmReceiver.java
# src/notes/ui/DateTimePicker.java
# src/notes/ui/DateTimePickerDialog.java
# src/notes/ui/DropdownMenu.java
# src/notes/ui/FoldersListAdapter.java
# src/notes/ui/NoteEditActivity.java
# src/notes/ui/NoteEditText.java
# src/notes/ui/NoteItemData.java
# src/notes/ui/NotesListActivity.java
# src/notes/ui/NotesListAdapter.java
# src/notes/ui/NotesListItem.java
# src/notes/ui/NotesPreferenceActivity.java
# src/res/layout/note_edit.xml
# src/res/layout/note_list.xml
# src/res/menu/note_edit.xml
# src/res/menu/note_list.xml
# src/res/values-zh-rCN/arrays.xml
# src/res/values-zh-rCN/strings.xml
# src/res/values-zh-rTW/arrays.xml
# src/res/values-zh-rTW/strings.xml
# src/res/values/arrays.xml
# src/res/values/colors.xml
# src/res/values/strings.xml
# src/res/values/styles.xml
|
wyf