tree cab147708791016c085f8f955639039b93a8c49a
parent aedec0dc79e505d16a63daa37f8472ef9ae23d28
parent 4f5d2f435751df89fbb44bbd9750798087f5aaca
author Yabin Cui <yabinc@google.com> 1499909710 +0000
committer android-build-merger <android-build-merger@google.com> 1499909710 +0000

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

Change-Id: Ifffef0768bfce6ae932f23d40c6d2c2bdb58d6c6