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