tree 4bc400e1498427da5b3bc385dd4569e2031f8edf
parent b9fc0a4d86eba33a2a2c2a1fd8c6ef3f4756eaa9
parent 1753fd00764614213cfb9f88b00ee16fe3c1da3e
author Guang Zhu <guangzhu@google.com> 1321636556 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321636556 -0800

am 1753fd00: am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1

* commit '1753fd00764614213cfb9f88b00ee16fe3c1da3e':
  add a self instrumentation into framework perf app