1

# Conflicts:
#	src/app/src/main/AndroidManifest.xml
#	src/app/src/main/java/net/micode/notes/data/Contact.java
#	src/app/src/main/java/net/micode/notes/data/Notes.java
#	src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
#	src/app/src/main/java/net/micode/notes/data/NotesProvider.java
#	src/app/src/main/java/net/micode/notes/gtask/data/Node.java
#	src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
#	src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
#	src/app/src/main/java/net/micode/notes/gtask/data/Task.java
#	src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
#	src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
#	src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
#	src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
#	src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
#	src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
#	src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
#	src/app/src/main/java/net/micode/notes/model/Note.java
#	src/app/src/main/java/net/micode/notes/model/WorkingNote.java
#	src/app/src/main/java/net/micode/notes/tool/BackupUtils.java
#	src/app/src/main/java/net/micode/notes/tool/DataUtils.java
#	src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
#	src/app/src/main/java/net/micode/notes/tool/ResourceParser.java
#	src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
#	src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
#	src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
#	src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
#	src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
#	src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
#	src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
#	src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
#	src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
#	src/app/src/main/java/net/micode/notes/ui/NoteItemData.java
#	src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
#	src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
#	src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
#	src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
#	src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
#	src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
#	src/app/src/main/res/menu/note_list.xml
#	src/app/src/main/res/values-zh-rCN/strings.xml
#	src/app/src/main/res/values/strings.xml

src/.idea/deploymentTargetDropDown.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="deploymentTargetDropDown">
     <value>
-      <entry key="Notes-master">
+      <entry key="app">
         <State />
       </entry>
     </value>

src/app/src/main/java/net/micode/notes/ui/RecycleBinActivity.java

@@ -84,7 +84,7 @@ public class RecycleBinActivity extends Activity {
     }
 
     /**
-     * 查询回收站便签列表,与NoteListActivity中相似
+     * 查询回收站便签列表
      */
     private void startAsyncNotesListQuery() {
         //查询便签列表,与NoteListActivity类似