-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
230 additions
and
4 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
-- 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 | ||
INJECTED from AndroidManifest.xml:0:0 | ||
INJECTED from AndroidManifest.xml:0:0 | ||
xmlns:android | ||
ADDED from AndroidManifest.xml:2:11 | ||
android:versionCode | ||
INJECTED from AndroidManifest.xml:0:0 | ||
INJECTED from AndroidManifest.xml:0:0 | ||
uses-permission#android.permission.INTERNET | ||
ADDED from AndroidManifest.xml:9:9 | ||
MERGED from com.mixpanel.android:mixpanel-android:4.5.3:17:5 | ||
android:name | ||
ADDED from AndroidManifest.xml:10:13 | ||
uses-permission#android.permission.ACCESS_NETWORK_STATE | ||
ADDED from AndroidManifest.xml:15:9 | ||
android:name | ||
ADDED from AndroidManifest.xml:16:13 | ||
application | ||
ADDED from AndroidManifest.xml:18:5 | ||
MERGED from com.android.support:appcompat-v7:21.0.3:16:5 | ||
MERGED from com.android.support:support-v4:21.0.3:16:5 | ||
MERGED from com.afollestad:material-dialogs:0.6.2.3:12:5 | ||
MERGED from com.android.support:appcompat-v7:21.0.3:16:5 | ||
MERGED from com.android.support:support-v4:21.0.3:16:5 | ||
MERGED from com.wefika:flowlayout:0.3.0:5:5 | ||
MERGED from com.mixpanel.android:mixpanel-android:4.5.3:44:5 | ||
MERGED from com.google.android.gms:play-services:6.5.87:20:5 | ||
MERGED from com.android.support:support-v4:21.0.3:16:5 | ||
android:label | ||
ADDED from AndroidManifest.xml:21:9 | ||
tools:ignore | ||
ADDED from com.mixpanel.android:mixpanel-android:4.5.3:44:18 | ||
android:allowBackup | ||
ADDED from AndroidManifest.xml:19:9 | ||
android:icon | ||
ADDED from AndroidManifest.xml:20:9 | ||
android:theme | ||
ADDED from AndroidManifest.xml:22:9 | ||
activity#com.anjithsasindran.materialcolorpicker.ColorPickerActivity | ||
ADDED from AndroidManifest.xml:23:9 | ||
android:label | ||
ADDED from AndroidManifest.xml:25:13 | ||
android:name | ||
ADDED from AndroidManifest.xml:24:13 | ||
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER | ||
ADDED from AndroidManifest.xml:26:13 | ||
action#android.intent.action.MAIN | ||
ADDED from AndroidManifest.xml:27:17 | ||
android:name | ||
ADDED from AndroidManifest.xml:27:25 | ||
category#android.intent.category.LAUNCHER | ||
ADDED from AndroidManifest.xml:29:17 | ||
android:name | ||
ADDED from AndroidManifest.xml:29:27 | ||
uses-sdk | ||
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested | ||
MERGED from com.android.support:appcompat-v7:21.0.3:15:5 | ||
MERGED from com.android.support:support-v4:21.0.3:15:5 | ||
MERGED from com.afollestad:material-dialogs:0.6.2.3:8:5 | ||
MERGED from com.android.support:appcompat-v7:21.0.3:15:5 | ||
MERGED from com.android.support:support-v4:21.0.3:15:5 | ||
MERGED from com.wefika:flowlayout:0.3.0:3:5 | ||
MERGED from com.mixpanel.android:mixpanel-android:4.5.3:11:5 | ||
MERGED from com.google.android.gms:play-services:6.5.87:18:5 | ||
MERGED from com.android.support:support-v4:21.0.3:15:5 | ||
android:targetSdkVersion | ||
INJECTED from AndroidManifest.xml:0:0 | ||
INJECTED from AndroidManifest.xml:0:0 | ||
tools:ignore | ||
ADDED from com.mixpanel.android:mixpanel-android:4.5.3:14:9 | ||
android:minSdkVersion | ||
INJECTED from AndroidManifest.xml:0:0 | ||
INJECTED from AndroidManifest.xml:0:0 | ||
meta-data#com.google.android.gms.version | ||
ADDED from com.google.android.gms:play-services:6.5.87:21:9 | ||
android:value | ||
ADDED from com.google.android.gms:play-services:6.5.87:23:13 | ||
android:name | ||
ADDED from com.google.android.gms:play-services:6.5.87:22:13 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters