From: Wei Wang <wvw@google.com>
Date: Thu, 6 Oct 2016 19:40:24 +0000 (+0000)
Subject: Merge "simpleperf: add perf counter into trace" am: a697736734
X-Git-Tag: android-x86-8.1-r1~68^2~146^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4abb209ba06625b61f91be6f2a486165aab955ff;p=android-x86%2Fsystem-extras.git

Merge "simpleperf: add perf counter into trace" am: a697736734
am: 8ec09a14ca

Change-Id: I4d48c0af6580e48192ee455fc44286b64620a3f6
---

4abb209ba06625b61f91be6f2a486165aab955ff