am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulato...

author Ying Wang <wangying@google.com>

Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)
author Ying Wang <wangying@google.com>
Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)
diff --cc target/product/core_base.mk

index 562035a,69bde63..d63e39f
--- 1/target/product/core_base.mk
--- 2/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@@ -60,10 -62,8 +60,9 @@@ PRODUCT_PACKAGES += 
       mdnsd \
       mms-common \
       requestsync \
-     screenrecord \
       telephony-common \
- -    voip-common
+ +    voip-common \
+ +    wifi-service
   
   $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
   # Override the PRODUCT_BOOT_JARS set in core_minimal.mk. The order matters.
diff --cc target/product/generic_no_telephony.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)
		1	2
target/product/core_base.mk	patch \|	diff1 \|	diff2 \|	blob \| history
target/product/generic_no_telephony.mk	patch \|	diff1 \|	diff2 \|	blob \| history