manifest-merger-release-report.txt@80b1a8c857bb (annotated)
manifest-merger-release-report.txt
Sat, 14 Feb 2015 00:40:28 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 14 Feb 2015 00:40:28 +0100
- changeset 28
- 80b1a8c857bb
- permissions
- -rw-r--r--
Back out change e1ea0f6a5a50 to implicitly match Android runtime name.
| michael@2 | 1 | -- Merging decision tree log --- |
| michael@2 | 2 | manifest |
| michael@2 | 3 | ADDED from AndroidManifest.xml:2:1 |
| michael@2 | 4 | package |
| michael@2 | 5 | ADDED from AndroidManifest.xml:3:5 |
| michael@2 | 6 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 7 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 8 | android:versionName |
| michael@2 | 9 | ADDED from AndroidManifest.xml:5:5 |
| michael@2 | 10 | android:versionCode |
| michael@2 | 11 | ADDED from AndroidManifest.xml:4:5 |
| michael@2 | 12 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 13 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 14 | xmlns:android |
| michael@2 | 15 | ADDED from AndroidManifest.xml:2:11 |
| michael@2 | 16 | uses-sdk |
| michael@2 | 17 | ADDED from AndroidManifest.xml:7:5 |
| michael@2 | 18 | android:targetSdkVersion |
| michael@2 | 19 | ADDED from AndroidManifest.xml:9:9 |
| michael@2 | 20 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 21 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 22 | android:minSdkVersion |
| michael@2 | 23 | ADDED from AndroidManifest.xml:8:9 |
| michael@2 | 24 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 25 | INJECTED from AndroidManifest.xml:0:0 |
| michael@2 | 26 | uses-permission#android.permission.AUTHENTICATE_ACCOUNTS |
| michael@2 | 27 | ADDED from AndroidManifest.xml:11:5 |
| michael@2 | 28 | android:name |
| michael@2 | 29 | ADDED from AndroidManifest.xml:11:22 |
| michael@2 | 30 | uses-permission#android.permission.READ_CALENDAR |
| michael@2 | 31 | ADDED from AndroidManifest.xml:12:5 |
| michael@2 | 32 | android:name |
| michael@2 | 33 | ADDED from AndroidManifest.xml:12:22 |
| michael@2 | 34 | uses-permission#android.permission.WRITE_CALENDAR |
| michael@2 | 35 | ADDED from AndroidManifest.xml:13:5 |
| michael@2 | 36 | android:name |
| michael@2 | 37 | ADDED from AndroidManifest.xml:13:22 |
| michael@2 | 38 | uses-permission#android.permission.INTERNET |
| michael@2 | 39 | ADDED from AndroidManifest.xml:14:5 |
| michael@2 | 40 | android:name |
| michael@2 | 41 | ADDED from AndroidManifest.xml:14:22 |
| michael@2 | 42 | application |
| michael@2 | 43 | ADDED from AndroidManifest.xml:16:5 |
| michael@2 | 44 | android:label |
| michael@2 | 45 | ADDED from AndroidManifest.xml:19:9 |
| michael@2 | 46 | android:allowBackup |
| michael@2 | 47 | ADDED from AndroidManifest.xml:17:9 |
| michael@2 | 48 | android:icon |
| michael@2 | 49 | ADDED from AndroidManifest.xml:18:9 |
| michael@2 | 50 | android:theme |
| michael@2 | 51 | ADDED from AndroidManifest.xml:20:9 |
| michael@2 | 52 | service#org.gege.caldavsyncadapter.syncadapter.SyncService |
| michael@2 | 53 | ADDED from AndroidManifest.xml:21:9 |
| michael@2 | 54 | android:exported |
| michael@2 | 55 | ADDED from AndroidManifest.xml:23:13 |
| michael@2 | 56 | android:name |
| michael@2 | 57 | ADDED from AndroidManifest.xml:22:13 |
| michael@2 | 58 | intent-filter#android.content.SyncAdapter |
| michael@2 | 59 | ADDED from AndroidManifest.xml:24:13 |
| michael@2 | 60 | action#android.content.SyncAdapter |
| michael@2 | 61 | ADDED from AndroidManifest.xml:25:17 |
| michael@2 | 62 | android:name |
| michael@2 | 63 | ADDED from AndroidManifest.xml:25:25 |
| michael@2 | 64 | meta-data#android.content.SyncAdapter |
| michael@2 | 65 | ADDED from AndroidManifest.xml:28:13 |
| michael@2 | 66 | android:resource |
| michael@2 | 67 | ADDED from AndroidManifest.xml:30:17 |
| michael@2 | 68 | android:name |
| michael@2 | 69 | ADDED from AndroidManifest.xml:29:17 |
| michael@2 | 70 | service#org.gege.caldavsyncadapter.authenticator.AuthenticationService |
| michael@2 | 71 | ADDED from AndroidManifest.xml:32:9 |
| michael@2 | 72 | android:exported |
| michael@2 | 73 | ADDED from AndroidManifest.xml:34:13 |
| michael@2 | 74 | android:name |
| michael@2 | 75 | ADDED from AndroidManifest.xml:33:13 |
| michael@2 | 76 | intent-filter#android.accounts.AccountAuthenticator |
| michael@2 | 77 | ADDED from AndroidManifest.xml:35:13 |
| michael@2 | 78 | action#android.accounts.AccountAuthenticator |
| michael@2 | 79 | ADDED from AndroidManifest.xml:36:17 |
| michael@2 | 80 | android:name |
| michael@2 | 81 | ADDED from AndroidManifest.xml:36:25 |
| michael@2 | 82 | meta-data#android.accounts.AccountAuthenticator |
| michael@2 | 83 | ADDED from AndroidManifest.xml:39:13 |
| michael@2 | 84 | android:resource |
| michael@2 | 85 | ADDED from AndroidManifest.xml:41:17 |
| michael@2 | 86 | android:name |
| michael@2 | 87 | ADDED from AndroidManifest.xml:40:17 |
| michael@2 | 88 | activity#org.gege.caldavsyncadapter.authenticator.AuthenticatorActivity |
| michael@2 | 89 | ADDED from AndroidManifest.xml:44:9 |
| michael@2 | 90 | android:label |
| michael@2 | 91 | ADDED from AndroidManifest.xml:46:13 |
| michael@2 | 92 | android:windowSoftInputMode |
| michael@2 | 93 | ADDED from AndroidManifest.xml:47:13 |
| michael@2 | 94 | android:name |
| michael@2 | 95 | ADDED from AndroidManifest.xml:45:13 |
| michael@2 | 96 | activity#org.gege.caldavsyncadapter.SyncStatusReportActivity |
| michael@2 | 97 | ADDED from AndroidManifest.xml:49:9 |
| michael@2 | 98 | android:label |
| michael@2 | 99 | ADDED from AndroidManifest.xml:51:13 |
| michael@2 | 100 | android:name |
| michael@2 | 101 | ADDED from AndroidManifest.xml:50:13 |
