tree 70312f7e89f69d5ae9d6128c25e2237863ffe512
parent cbf583d7229aaff65734b4234e81db8ead864761
parent e8228afb2bd005ae25ce58719f9d678389b26a16
author Jack Wang <jackwang@google.com> 1256947676 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256947676 -0700

am e8228afb: Merge change I92cdc5ed into eclair

Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form