From: Than McIntosh <thanm@google.com>
Date: Thu, 2 Jun 2016 18:46:37 +0000 (+0000)
Subject: Merge "Handle additional record types in perf.data reader."
X-Git-Tag: android-x86-8.1-r1~68^2~165^2~108^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ee0c018b326327e25174f6be876686d21edb152;p=android-x86%2Fsystem-extras.git

Merge "Handle additional record types in perf.data reader."
am: d9aa9de346

* commit 'd9aa9de34638e46de141584bad9daf71c07ab678':
  Handle additional record types in perf.data reader.

Change-Id: I9ad532edb743d4e38f94c3ccf4f9981030323e22
---

4ee0c018b326327e25174f6be876686d21edb152