OSDN Git Service

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

Change-Id: I4d48c0af6580e48192ee455fc44286b64620a3f6


Trivial merge