Skip to content

Commit 8c25a15

Browse files
authored
Add files via upload
1 parent 2866c4c commit 8c25a15

File tree

1 file changed

+94
-0
lines changed

1 file changed

+94
-0
lines changed
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
-- Merging decision tree log ---
2+
manifest
3+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:2:1-21:12
4+
package
5+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:3:5-44
6+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
7+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
8+
android:versionName
9+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
10+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
11+
xmlns:android
12+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:2:11-69
13+
android:versionCode
14+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
15+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
16+
application
17+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:5:5-19:19
18+
MERGED from [com.android.support:appcompat-v7:25.3.1] /Users/sraval/.android/build-cache/0cabbffd202901842e242159fb5eb36da560021d/output/AndroidManifest.xml:29:5-20
19+
MERGED from [com.android.support:support-v4:25.3.1] /Users/sraval/.android/build-cache/f02ef11a6f3a4db36987a602a302146f02d08a8f/output/AndroidManifest.xml:29:5-20
20+
MERGED from [com.android.support:support-fragment:25.3.1] /Users/sraval/.android/build-cache/2d8d2584d3e37a53d3cac84d09bb1df731edd28d/output/AndroidManifest.xml:29:5-20
21+
MERGED from [com.android.support:support-media-compat:25.3.1] /Users/sraval/.android/build-cache/5185615d0d8d53551e58dbaf5a8acab9baa62e6f/output/AndroidManifest.xml:29:5-20
22+
MERGED from [com.android.support:support-core-ui:25.3.1] /Users/sraval/.android/build-cache/2f45e62c69fd5bf9810d77b5bfa53c6719c3ee1e/output/AndroidManifest.xml:29:5-20
23+
MERGED from [com.android.support:support-core-utils:25.3.1] /Users/sraval/.android/build-cache/ccab67e7f9ecdac5d16f1c9f1bf1f37a34573ba1/output/AndroidManifest.xml:29:5-20
24+
MERGED from [com.android.support:animated-vector-drawable:25.3.1] /Users/sraval/.android/build-cache/8b47f307aa9d6f62af7ee9b9963c8f40c12442a1/output/AndroidManifest.xml:26:5-20
25+
MERGED from [com.android.support:support-vector-drawable:25.3.1] /Users/sraval/.android/build-cache/58b072bb5a383d6bd9487f3119e49d15b74fe1e8/output/AndroidManifest.xml:26:5-20
26+
MERGED from [com.android.support:support-compat:25.3.1] /Users/sraval/.android/build-cache/03f28f8055a654b8f4a17f498e9b6e6574d72895/output/AndroidManifest.xml:29:5-20
27+
MERGED from [org.tensorflow:tensorflow-android:1.2.0-rc0] /Users/sraval/.android/build-cache/f9e95a0b716da227b16d8244aa7d3021dd9dfa8e/output/AndroidManifest.xml:5:5-6:19
28+
android:label
29+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:8:9-41
30+
android:supportsRtl
31+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:10:9-35
32+
android:roundIcon
33+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:9:9-54
34+
android:allowBackup
35+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:6:9-35
36+
android:icon
37+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:7:9-43
38+
android:theme
39+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:11:9-40
40+
activity#mariannelinhares.mnistandroid.MainActivity
41+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:12:9-18:20
42+
android:screenOrientation
43+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:12:48-84
44+
android:name
45+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:12:19-47
46+
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
47+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:13:13-17:29
48+
action#android.intent.action.MAIN
49+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:14:17-69
50+
android:name
51+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:14:25-66
52+
category#android.intent.category.LAUNCHER
53+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:16:17-77
54+
android:name
55+
ADDED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:16:27-74
56+
uses-sdk
57+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
58+
MERGED from [com.android.support:appcompat-v7:25.3.1] /Users/sraval/.android/build-cache/0cabbffd202901842e242159fb5eb36da560021d/output/AndroidManifest.xml:21:5-23:78
59+
MERGED from [com.android.support:support-v4:25.3.1] /Users/sraval/.android/build-cache/f02ef11a6f3a4db36987a602a302146f02d08a8f/output/AndroidManifest.xml:21:5-23:54
60+
MERGED from [com.android.support:support-fragment:25.3.1] /Users/sraval/.android/build-cache/2d8d2584d3e37a53d3cac84d09bb1df731edd28d/output/AndroidManifest.xml:21:5-23:60
61+
MERGED from [com.android.support:support-media-compat:25.3.1] /Users/sraval/.android/build-cache/5185615d0d8d53551e58dbaf5a8acab9baa62e6f/output/AndroidManifest.xml:21:5-23:63
62+
MERGED from [com.android.support:support-core-ui:25.3.1] /Users/sraval/.android/build-cache/2f45e62c69fd5bf9810d77b5bfa53c6719c3ee1e/output/AndroidManifest.xml:21:5-23:58
63+
MERGED from [com.android.support:support-core-utils:25.3.1] /Users/sraval/.android/build-cache/ccab67e7f9ecdac5d16f1c9f1bf1f37a34573ba1/output/AndroidManifest.xml:21:5-23:61
64+
MERGED from [com.android.support:animated-vector-drawable:25.3.1] /Users/sraval/.android/build-cache/8b47f307aa9d6f62af7ee9b9963c8f40c12442a1/output/AndroidManifest.xml:20:5-44
65+
MERGED from [com.android.support:support-vector-drawable:25.3.1] /Users/sraval/.android/build-cache/58b072bb5a383d6bd9487f3119e49d15b74fe1e8/output/AndroidManifest.xml:20:5-43
66+
MERGED from [com.android.support:support-compat:25.3.1] /Users/sraval/.android/build-cache/03f28f8055a654b8f4a17f498e9b6e6574d72895/output/AndroidManifest.xml:21:5-23:58
67+
tools:overrideLibrary
68+
ADDED from [com.android.support:appcompat-v7:25.3.1] /Users/sraval/.android/build-cache/0cabbffd202901842e242159fb5eb36da560021d/output/AndroidManifest.xml:23:9-75
69+
android:targetSdkVersion
70+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
71+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
72+
android:minSdkVersion
73+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
74+
INJECTED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml
75+
meta-data#android.support.VERSION
76+
ADDED from [com.android.support:appcompat-v7:25.3.1] /Users/sraval/.android/build-cache/0cabbffd202901842e242159fb5eb36da560021d/output/AndroidManifest.xml:25:5-27:34
77+
MERGED from [com.android.support:support-v4:25.3.1] /Users/sraval/.android/build-cache/f02ef11a6f3a4db36987a602a302146f02d08a8f/output/AndroidManifest.xml:25:5-27:34
78+
MERGED from [com.android.support:support-fragment:25.3.1] /Users/sraval/.android/build-cache/2d8d2584d3e37a53d3cac84d09bb1df731edd28d/output/AndroidManifest.xml:25:5-27:34
79+
MERGED from [com.android.support:support-media-compat:25.3.1] /Users/sraval/.android/build-cache/5185615d0d8d53551e58dbaf5a8acab9baa62e6f/output/AndroidManifest.xml:25:5-27:34
80+
MERGED from [com.android.support:support-core-ui:25.3.1] /Users/sraval/.android/build-cache/2f45e62c69fd5bf9810d77b5bfa53c6719c3ee1e/output/AndroidManifest.xml:25:5-27:34
81+
MERGED from [com.android.support:support-core-utils:25.3.1] /Users/sraval/.android/build-cache/ccab67e7f9ecdac5d16f1c9f1bf1f37a34573ba1/output/AndroidManifest.xml:25:5-27:34
82+
MERGED from [com.android.support:animated-vector-drawable:25.3.1] /Users/sraval/.android/build-cache/8b47f307aa9d6f62af7ee9b9963c8f40c12442a1/output/AndroidManifest.xml:22:5-24:34
83+
MERGED from [com.android.support:support-vector-drawable:25.3.1] /Users/sraval/.android/build-cache/58b072bb5a383d6bd9487f3119e49d15b74fe1e8/output/AndroidManifest.xml:22:5-24:34
84+
MERGED from [com.android.support:support-compat:25.3.1] /Users/sraval/.android/build-cache/03f28f8055a654b8f4a17f498e9b6e6574d72895/output/AndroidManifest.xml:25:5-27:34
85+
android:value
86+
ADDED from [com.android.support:appcompat-v7:25.3.1] /Users/sraval/.android/build-cache/0cabbffd202901842e242159fb5eb36da560021d/output/AndroidManifest.xml:27:9-31
87+
android:name
88+
ADDED from [com.android.support:appcompat-v7:25.3.1] /Users/sraval/.android/build-cache/0cabbffd202901842e242159fb5eb36da560021d/output/AndroidManifest.xml:26:9-47
89+
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
90+
IMPLIED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:2:1-21:12 reason: tensorflow.contrib.android has a targetSdkVersion < 4
91+
uses-permission#android.permission.READ_PHONE_STATE
92+
IMPLIED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:2:1-21:12 reason: tensorflow.contrib.android has a targetSdkVersion < 4
93+
uses-permission#android.permission.READ_EXTERNAL_STORAGE
94+
IMPLIED from /Users/sraval/Downloads/mnist-android-tensorflow-master/MnistAndroid/app/src/main/AndroidManifest.xml:2:1-21:12 reason: tensorflow.contrib.android requested WRITE_EXTERNAL_STORAGE

0 commit comments

Comments
 (0)