tree 8178ab4fca3810b2579fb2d427ef0821dcb87629
parent 1a3c051bcc787363d9154da4a8e8e562dda32926
parent 5eefd7711f63bc1b67ec927a8c43363f426121cc
author Guang Zhu <guangzhu@google.com> 1321581863 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321581863 -0800

Merge "add a self instrumentation into framework perf app" into ics-mr1