Merge change I01d9d733 into eclair

* changes:
  Add a host shell function to generate system_server stack traces
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f10b331..913c6cd6b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
   # which is the version that we reveal to the end user.
   # Update this value when the platform version changes (rather
   # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 2.1
+  PLATFORM_VERSION := 2.0.1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index ba105f8..572b823 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -30,6 +30,8 @@
 	GestureBuilder \
 	SoftKeyboard
 
+PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
+
 PRODUCT_COPY_FILES := \
 	development/data/etc/vold.conf:system/etc/vold.conf \
 	frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml