-- Merging decision tree log ---
manifest
<<<<<<< HEAD
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
	package
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
		INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml
	android:versionName
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
		INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml
	xmlns:android
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
	android:versionCode
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
		INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml
uses-sdk
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
	android:targetSdkVersion
		INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml
	android:minSdkVersion
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
		INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
application
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
	android:extractNativeLibs
		INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml
	android:label
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
	android:icon
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
	android:label
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
	android:launchMode
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
	android:windowSoftInputMode
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
	android:uiOptions
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
	android:configChanges
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
	android:theme
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
action#android.intent.action.MAIN
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
category#android.intent.category.LAUNCHER
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
activity#net.micode.notes.ui.NoteEditActivity
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
	android:launchMode
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
	android:configChanges
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
	android:theme
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
action#android.intent.action.VIEW
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
category#android.intent.category.DEFAULT
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
data
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
	android:mimeType
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
action#android.intent.action.SEARCH
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
meta-data#android.app.searchable
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
	android:resource
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
provider#net.micode.notes.data.NotesProvider
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
	android:authorities
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
	android:multiprocess
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
	android:label
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
action#android.appwidget.action.APPWIDGET_UPDATE
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
meta-data#android.appwidget.provider
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
	android:resource
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
	android:label
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
action#android.intent.action.BOOT_COMPLETED
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
receiver#net.micode.notes.ui.AlarmReceiver
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
	android:process
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
	android:label
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
	android:launchMode
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
	android:theme
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
	android:label
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
	android:launchMode
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
	android:theme
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
	android:exported
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
meta-data#android.app.default_searchable
ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
	android:value
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
	android:name
		ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
=======
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
	package
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
		INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml
	android:versionName
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
		INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml
	xmlns:android
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
	android:versionCode
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
		INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml
uses-sdk
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
	android:targetSdkVersion
		INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml
	android:minSdkVersion
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
		INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
application
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
	android:extractNativeLibs
		INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml
	android:label
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
	android:icon
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
	android:label
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
	android:launchMode
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
	android:windowSoftInputMode
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
	android:uiOptions
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
	android:configChanges
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
	android:theme
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
action#android.intent.action.MAIN
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
category#android.intent.category.LAUNCHER
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
activity#net.micode.notes.ui.NoteEditActivity
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
	android:launchMode
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
	android:configChanges
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
	android:theme
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
action#android.intent.action.VIEW
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
category#android.intent.category.DEFAULT
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
data
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
	android:mimeType
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
action#android.intent.action.SEARCH
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
meta-data#android.app.searchable
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
	android:resource
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
provider#net.micode.notes.data.NotesProvider
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
	android:authorities
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
	android:multiprocess
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
	android:label
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
action#android.appwidget.action.APPWIDGET_UPDATE
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
meta-data#android.appwidget.provider
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
	android:resource
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
	android:label
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
action#android.intent.action.BOOT_COMPLETED
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
receiver#net.micode.notes.ui.AlarmReceiver
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
	android:process
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
	android:label
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
	android:launchMode
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
	android:theme
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
	android:label
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
	android:launchMode
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
	android:theme
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
	android:exported
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
meta-data#android.app.default_searchable
ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
	android:value
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
	android:name
		ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
>>>>>>> develop
