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

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

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

Change-Id: Ife09330d206ad18b161eb6ac392151803525fb18
---

31f191f6437d420bfbdc1b828f63f6cfc315bdfb