From d06a633f4a1f8020149b3a2d92ca097208e0e155 Mon Sep 17 00:00:00 2001
From: Brett Chabot <>
Date: Tue, 31 Mar 2009 14:41:33 -0700
Subject: [PATCH 1/2] AI 143809: am: CL 143784 am: CL 143737 Fix kernel build:
 remove the '.' from runtest.py shortcut   Original author: brettchabot  
 Merged from: //branches/cupcake/...   Original author: android-build   Merged
 from: //branches/donutburger/...

Automated import of CL 143809
---
 envsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/envsetup.sh b/envsetup.sh
index bccf7c9c97..d15abcbf39 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -975,7 +975,7 @@ function runtest()
 }
 
 # simple shortcut to the runtest.py command
-function runtest.py()
+function runtest_py()
 {
     T=$(gettop)
     if [ ! "$T" ]; then

From d9b64e1350fabfeac1c4d31c7a773302be01b3bf Mon Sep 17 00:00:00 2001
From: Raphael Moll <>
Date: Tue, 31 Mar 2009 17:20:53 -0700
Subject: [PATCH 2/2] AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv
 in SDK (bug #1640225)   Original author: raphael   Merged from:
 //branches/cupcake/...   Original author: android-build   Merged from:
 //branches/donutburger/...

Automated import of CL 143880
---
 core/main.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/main.mk b/core/main.mk
index 37c580deac..815745b0b1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -290,6 +290,7 @@ subdirs := \
 	dalvik/dexdump \
 	dalvik/libdex \
 	dalvik/tools/dmtracedump \
+	dalvik/tools/hprof-conv \
 	development/emulator/mksdcard \
 	development/tools/activitycreator \
 	development/tools/line_endings \