tree 2f2b0a5f0812e4d27446fa648fc73bdcc236f3d4
parent c4eb610186866cce7e96a4fd67c43730252cab99
parent 3e74919c11164a20df8904667b624d979640cddb
author Yabin Cui <yabinc@google.com> 1499909861 +0000
committer android-build-merger <android-build-merger@google.com> 1499909861 +0000

Merge "simpleperf: add test for recording cpu-clock." am: 9dc8dd6de2 am: 4f5d2f4357
am: 3e74919c11

Change-Id: Id3c2a2d54fbf9f8181dc6777846d64ea9edea8fd