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
diff --git a/core/main.mk b/core/main.mk
index 37c580d..815745b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -290,6 +290,7 @@
dalvik/dexdump \
dalvik/libdex \
dalvik/tools/dmtracedump \
+ dalvik/tools/hprof-conv \
development/emulator/mksdcard \
development/tools/activitycreator \
development/tools/line_endings \