am b6cc8421: am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote."

* commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
  Add a default value for ro.zygote.

diff --cc target/product/core_minimal.mk
index e13e59b,fc69973..7fbdee6
--- 1/target/product/core_minimal.mk
--- 2/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@@ -76,10 -73,14 +76,15 @@@ PRODUCT_BOOT_JARS := 
      android.policy \
      services \
      apache-xml \
 -    webviewchromium
 +    webviewchromium \
 +    wifi-service
  
 -PRODUCT_RUNTIMES := runtime_libdvm_default
 -PRODUCT_RUNTIMES += runtime_libart
 +PRODUCT_RUNTIMES := runtime_libart_default
 +PRODUCT_RUNTIMES += runtime_libdvm
  
+ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+     ro.zygote=zygote32
+ PRODUCT_COPY_FILES += \
+     system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc
+ 
  $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)