tree b894209b672f6d6ec94006fccddabdb599270356
parent ba5dfbf9f4b87308c1cc8d986f4bd94520013472
author Raphael Moll <> 1238545254 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238545254 -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