commit 07bd49498684cf905eeab6260a4de11f8ebc4f64
author David 'Digit' Turner <digit@android.com> Thu Jun 23 06:25:42 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 23 06:25:42 2011 -0700
tree 397aca75412dbc0d1ecda55a72e273bac0c4d200
parent 4a2a7caf951c606e2796cf273a1459ce6f0af6cd
parent bf115d33f26949b636d8cac79d253448fbca2388

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

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

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 0380226..9badbfd 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