commit 6ab8e331e3bb7738ab26b9bcfd4e9af98a134328
author David 'Digit' Turner <digit@android.com> Fri Jun 24 10:50:47 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 24 10:50:47 2011 -0700
tree 82007f9cbb904a68376ae29c122691a666114092
parent 229cc8fc8963aa2c95b64ce6b9bcf17be59f0c72
parent 07bd49498684cf905eeab6260a4de11f8ebc4f64

am 07bd4949: am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."

* commit '07bd49498684cf905eeab6260a4de11f8ebc4f64':
  sdk: Ensure we copy build.prop to platform image directory.

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index d8e6e05..ad78f6b 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -77,6 +77,7 @@
 ramdisk.img                             platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/ramdisk.img
 userdata.img                            platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/userdata.img
 prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
+system/build.prop platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/build.prop
 
 # emulator skins from sdk.git
 #development/tools/emulator/skins/QVGA      platforms/${PLATFORM_NAME}/skins/QVGA