-- Merging decision tree log ---
manifest
ADDED from AndroidManifest.xml:2:1
	xmlns:tools
		ADDED from AndroidManifest.xml:3:5
	xmlns:android
		ADDED from AndroidManifest.xml:2:11
	package
		ADDED from AndroidManifest.xml:4: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
	android:versionCode
		INJECTED from AndroidManifest.xml:0:0
		INJECTED from AndroidManifest.xml:0:0
uses-permission#android.permission.CAMERA
ADDED from AndroidManifest.xml:6:5
	android:name
		ADDED from AndroidManifest.xml:6:22
uses-feature#android.hardware.camera
ADDED from AndroidManifest.xml:7:5
	android:name
		ADDED from AndroidManifest.xml:7:19
uses-permission#android.hardware.camera.autofocus
ADDED from AndroidManifest.xml:8:5
	android:name
		ADDED from AndroidManifest.xml:8:22
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:9:5
	android:name
		ADDED from AndroidManifest.xml:9:22
uses-permission#android.permission.READ_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:10:5
	android:name
		ADDED from AndroidManifest.xml:10:22
uses-permission#android.permission.ACCESS_FINE_LOCATION
ADDED from AndroidManifest.xml:12:5
	android:name
		ADDED from AndroidManifest.xml:12:22
uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:13:5
	android:name
		ADDED from AndroidManifest.xml:13:22
application
ADDED from AndroidManifest.xml:15: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
	android:label
		ADDED from AndroidManifest.xml:19:9
	android:allowBackup
		ADDED from AndroidManifest.xml:17:9
	android:icon
		ADDED from AndroidManifest.xml:18:9
	android:theme
		ADDED from AndroidManifest.xml:20:9
	android:name
		ADDED from AndroidManifest.xml:16:9
activity#com.example.unodtantos.appqueology2.controlador.MenuPrincipal
ADDED from AndroidManifest.xml:22:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:25:13
	android:label
		ADDED from AndroidManifest.xml:24:13
	android:name
		ADDED from AndroidManifest.xml:23: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:28:17
	android:name
		ADDED from AndroidManifest.xml:28:27
activity#com.example.unodtantos.appqueology2.controlador.CargarProyecto
ADDED from AndroidManifest.xml:32:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:35:13
	android:label
		ADDED from AndroidManifest.xml:34:13
	android:name
		ADDED from AndroidManifest.xml:33:13
intent-filter#android.intent.action.MAIN+android.intent.category.DEFAULT
ADDED from AndroidManifest.xml:36:13
category#android.intent.category.DEFAULT
ADDED from AndroidManifest.xml:38:17
	android:name
		ADDED from AndroidManifest.xml:38:27
activity#com.example.unodtantos.appqueology2.controlador.AreaTrabajoActual
ADDED from AndroidManifest.xml:42:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:45:13
	android:label
		ADDED from AndroidManifest.xml:44:13
	android:configChanges
		ADDED from AndroidManifest.xml:46:13
	android:name
		ADDED from AndroidManifest.xml:43:13
activity#com.example.unodtantos.appqueology2.controlador.Tabla
ADDED from AndroidManifest.xml:53:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:56:13
	android:label
		ADDED from AndroidManifest.xml:55:13
	android:name
		ADDED from AndroidManifest.xml:54:13
activity#com.example.unodtantos.appqueology2.controlador.DatosNodoCentral
ADDED from AndroidManifest.xml:63:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:66:13
	android:label
		ADDED from AndroidManifest.xml:65:13
	android:name
		ADDED from AndroidManifest.xml:64:13
activity#com.example.unodtantos.appqueology2.controlador.DiarioExcavacion
ADDED from AndroidManifest.xml:73:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:76:13
	android:label
		ADDED from AndroidManifest.xml:75:13
	android:name
		ADDED from AndroidManifest.xml:74:13
activity#com.example.unodtantos.appqueology2.controlador.Grafo
ADDED from AndroidManifest.xml:83:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:86:13
	android:label
		ADDED from AndroidManifest.xml:85:13
	android:name
		ADDED from AndroidManifest.xml:84:13
activity#com.example.unodtantos.appqueology2.controlador.ImagenUe
ADDED from AndroidManifest.xml:93:9
	android:screenOrientation
		ADDED from AndroidManifest.xml:97:13
	android:label
		ADDED from AndroidManifest.xml:95:13
	android:hardwareAccelerated
		ADDED from AndroidManifest.xml:96:13
	android:name
		ADDED from AndroidManifest.xml:94:13
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 AppQueology2.librerias:library:unspecified:7:5
	android:targetSdkVersion
		INJECTED from AndroidManifest.xml:0:0
		INJECTED from AndroidManifest.xml:0:0
	android:minSdkVersion
		INJECTED from AndroidManifest.xml:0:0
		INJECTED from AndroidManifest.xml:0:0
