tree 02e6c745b35b9ac87e01b7de1458fe95cfd226ed
parent e4d6ac66535b5c8ecf725c2d9677bb198b9a6f30
parent 569382dd66ed7855d28fd594dc4ef19c1deef7f2
author Yabin Cui <yabinc@google.com> 1494888646 +0000
committer android-build-merger <android-build-merger@google.com> 1494888646 +0000

Merge "simpleperf: fix report_sample_test." am: 7b615cfb00 am: 8376ac2f2e am: 253c2ad631
am: 569382dd66

Change-Id: I216690062cfdfa7b79c3a5732123fec1609437a5