dynamicbible/Android/DynamicBible/app/build/outputs/logs/manifest-merger-debug-report.txt
walljm 6a8289ddc8 FIX: Fixed a minor search bug
* updated to new version of android studio
2016-09-10 16:57:09 -04:00

61 lines
3.9 KiB
Plaintext

-- Merging decision tree log ---
manifest
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:2:1-30:12
package
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:3:5-34
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
android:versionName
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:5:5-32
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
android:versionCode
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:4:5-29
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:2:11-69
supports-screens
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:6:1-11:3
android:largeScreens
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:9:19-46
android:smallScreens
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:7:19-46
android:normalScreens
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:8:19-47
android:xlargeScreens
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:10:19-47
uses-sdk
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:13:5-44
android:targetSdkVersion
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
android:minSdkVersion
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:13:15-41
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
INJECTED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml
application
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:15:5-28:19
android:label
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:17:9-41
android:icon
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:16:9-45
activity#walljm.dynamicbible.DynamicBibleActivity
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:18:9-27:20
android:label
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:19:13-45
android:configChanges
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:21:13-63
android:name
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:20:13-49
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:22:13-26:29
action#android.intent.action.MAIN
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:23:17-69
android:name
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:23:25-66
category#android.intent.category.LAUNCHER
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:25:17-77
android:name
ADDED from C:\Projects\DynamicBible\Android\DynamicBible\app\src\main\AndroidManifest.xml:25:27-74