resolved conflicts for merge of f8e4d1b7 to master

author Colin Cross <ccross@android.com>

Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)

committer Colin Cross <ccross@android.com>

Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
author Colin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
committer Colin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
diff --cc target/product/base.mk
Simple merge
diff --cc target/product/core_minimal.mk

index 8c09268,e16d234..848cde0
--- 1/target/product/core_minimal.mk
--- 2/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@@ -59,7 -58,7 +59,8 @@@ PRODUCT_PACKAGES += 
       screencap \
       sensorservice \
       uiautomator \
+ +    uncrypt
+     webview
   
   # The order of PRODUCT_BOOT_JARS matters.
   PRODUCT_BOOT_JARS := \
author	Colin Cross <ccross@android.com>
	Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
committer	Colin Cross <ccross@android.com>
	Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
		1	2
target/product/base.mk	patch \|	diff1 \|	diff2 \|	blob \| history
target/product/core_minimal.mk	patch \|	diff1 \|	diff2 \|	blob \| history