From: Colin Cross Date: Sat, 22 Mar 2014 00:25:08 +0000 (-0700) Subject: resolved conflicts for merge of f8e4d1b7 to master X-Git-Tag: android-x86-6.0-r1~1945 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f2b60c0f8052ed6b456e2f63a0e6798d049410ad;p=android-x86%2Fbuild.git resolved conflicts for merge of f8e4d1b7 to master Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94 --- f2b60c0f8052ed6b456e2f63a0e6798d049410ad diff --cc target/product/core_minimal.mk index 8c0926843,e16d234b4..848cde0ac --- a/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 := \