OSDN Git Service

Merge "simpleperf: add perf counter into trace" am: a697736734 am: 8ec09a14ca am...
authorWei Wang <wvw@google.com>
Thu, 6 Oct 2016 19:46:56 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 19:46:56 +0000 (19:46 +0000)
am: a0b50547b8

Change-Id: I96cc5eccc8a6f936f1d5586bd4f1f94c5a1f5d51


Trivial merge