tree 2ac791bf068bcf81cc1a2e9d30cb397bc3ccf7f3
parent bd2d5da516763b38d06126439e883f309ca6656a
parent 253c2ad6312b4f2cb0c98eb41abaf7c3bb9af4f9
author Yabin Cui <yabinc@google.com> 1494888027 +0000
committer android-build-merger <android-build-merger@google.com> 1494888027 +0000

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

Change-Id: Id16a0bc23af2d336e5709ddc15c13a2e36dcf27a