tree 5f216325a942c030ee93df998140025e2bc46d36
parent d06a633f4a1f8020149b3a2d92ca097208e0e155
author Raphael Moll <> 1238545253 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238545253 -0700

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