diff -r 16922eb04d75 -r dee028db6e9b manifest-merger-release-report.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/manifest-merger-release-report.txt Tue Feb 10 19:25:00 2015 +0100 @@ -0,0 +1,101 @@ +-- Merging decision tree log --- +manifest +ADDED from AndroidManifest.xml:2:1 + package + ADDED from AndroidManifest.xml:3:5 + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 + android:versionName + ADDED from AndroidManifest.xml:5:5 + android:versionCode + ADDED from AndroidManifest.xml:4:5 + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 + xmlns:android + ADDED from AndroidManifest.xml:2:11 +uses-sdk +ADDED from AndroidManifest.xml:7:5 + android:targetSdkVersion + ADDED from AndroidManifest.xml:9:9 + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 + android:minSdkVersion + ADDED from AndroidManifest.xml:8:9 + INJECTED from AndroidManifest.xml:0:0 + INJECTED from AndroidManifest.xml:0:0 +uses-permission#android.permission.AUTHENTICATE_ACCOUNTS +ADDED from AndroidManifest.xml:11:5 + android:name + ADDED from AndroidManifest.xml:11:22 +uses-permission#android.permission.READ_CALENDAR +ADDED from AndroidManifest.xml:12:5 + android:name + ADDED from AndroidManifest.xml:12:22 +uses-permission#android.permission.WRITE_CALENDAR +ADDED from AndroidManifest.xml:13:5 + android:name + ADDED from AndroidManifest.xml:13:22 +uses-permission#android.permission.INTERNET +ADDED from AndroidManifest.xml:14:5 + android:name + ADDED from AndroidManifest.xml:14:22 +application +ADDED from AndroidManifest.xml:16:5 + android:label + ADDED from AndroidManifest.xml:19:9 + android:allowBackup + ADDED from AndroidManifest.xml:17:9 + android:icon + ADDED from AndroidManifest.xml:18:9 + android:theme + ADDED from AndroidManifest.xml:20:9 +service#org.gege.caldavsyncadapter.syncadapter.SyncService +ADDED from AndroidManifest.xml:21:9 + android:exported + ADDED from AndroidManifest.xml:23:13 + android:name + ADDED from AndroidManifest.xml:22:13 +intent-filter#android.content.SyncAdapter +ADDED from AndroidManifest.xml:24:13 +action#android.content.SyncAdapter +ADDED from AndroidManifest.xml:25:17 + android:name + ADDED from AndroidManifest.xml:25:25 +meta-data#android.content.SyncAdapter +ADDED from AndroidManifest.xml:28:13 + android:resource + ADDED from AndroidManifest.xml:30:17 + android:name + ADDED from AndroidManifest.xml:29:17 +service#org.gege.caldavsyncadapter.authenticator.AuthenticationService +ADDED from AndroidManifest.xml:32:9 + android:exported + ADDED from AndroidManifest.xml:34:13 + android:name + ADDED from AndroidManifest.xml:33:13 +intent-filter#android.accounts.AccountAuthenticator +ADDED from AndroidManifest.xml:35:13 +action#android.accounts.AccountAuthenticator +ADDED from AndroidManifest.xml:36:17 + android:name + ADDED from AndroidManifest.xml:36:25 +meta-data#android.accounts.AccountAuthenticator +ADDED from AndroidManifest.xml:39:13 + android:resource + ADDED from AndroidManifest.xml:41:17 + android:name + ADDED from AndroidManifest.xml:40:17 +activity#org.gege.caldavsyncadapter.authenticator.AuthenticatorActivity +ADDED from AndroidManifest.xml:44:9 + android:label + ADDED from AndroidManifest.xml:46:13 + android:windowSoftInputMode + ADDED from AndroidManifest.xml:47:13 + android:name + ADDED from AndroidManifest.xml:45:13 +activity#org.gege.caldavsyncadapter.SyncStatusReportActivity +ADDED from AndroidManifest.xml:49:9 + android:label + ADDED from AndroidManifest.xml:51:13 + android:name + ADDED from AndroidManifest.xml:50:13