From: Yabin Cui <yabinc@google.com>
Date: Thu, 27 Oct 2016 16:40:09 +0000 (+0000)
Subject: Merge "simpleperf: merge records from different buffers in memory." am: f95e0a3b26
X-Git-Tag: android-x86-8.1-r1~68^2~48^2~69
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c94a502c98;p=android-x86%2Fsystem-extras.git

Merge "simpleperf: merge records from different buffers in memory." am: f95e0a3b26
am: 7f12240c5e

Change-Id: Ia9bc150305d8fe940925930d59699d071f7c09d4
---

c94a502c985d6e879c1459c9d8f7ef64b8ecb4d2