From: Yabin Cui <yabinc@google.com>
Date: Mon, 8 Aug 2016 23:03:38 +0000 (+0000)
Subject: Merge "simpleperf: fix test record_cmd.duration_option." am: 8cd939bd7a am: e1e462b9f2
X-Git-Tag: android-x86-8.1-r1~68^2~204
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39a88c0d10;p=android-x86%2Fsystem-extras.git

Merge "simpleperf: fix test record_cmd.duration_option." am: 8cd939bd7a am: e1e462b9f2
am: fec0c06270

Change-Id: I34d915008240703b0cb208804d4ce7a9ab34b42a
---

39a88c0d102e32c01ddfbddaa70564a6ee156392