tree d71b0e80dbaa13966717900e58f5cdfdb5c14bfe
parent a4008606a2c006c7e1ab1c064d935c45da20c07a
parent e0cadd7cd811a674df62279dec00d17678b2c501
author Jack Wang <jackwang@google.com> 1258413901 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258413901 -0800

am e0cadd7c: Merge change Iffbb6e55 into eclair

Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-plus-aosp

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler