Merge branch 'gengchangzhen'
# Conflicts:
# src/net/micode/notes/data/Contact.java
# src/net/micode/notes/data/Notes.java
# src/net/micode/notes/data/NotesDatabaseHelper.java
# src/net/micode/notes/data/NotesProvider.java
# src/net/micode/notes/gtask/data/MetaData.java
# src/net/micode/notes/gtask/data/Node.java
# src/net/micode/notes/gtask/data/SqlData.java
# src/net/micode/notes/gtask/data/SqlNote.java
# src/net/micode/notes/gtask/data/Task.java
# src/net/micode/notes/gtask/data/TaskList.java
# src/net/micode/notes/gtask/exception/ActionFailureException.java
# src/net/micode/notes/gtask/exception/NetworkFailureException.java
# src/net/micode/notes/gtask/remote/GTaskASyncTask.java
# src/net/micode/notes/gtask/remote/GTaskClient.java
# src/net/micode/notes/gtask/remote/GTaskManager.java
# src/net/micode/notes/gtask/remote/GTaskSyncService.java
|
dszubf
pkwgx9soh