tree 68c37c1350406027f56d448df91a3642be92cfbd
parent a8e4161eeddf97fb378e61f7386a4a7940f9a610
parent d2b9b31a6303b051e47a63cce91fc21de6fe142d
author Yabin Cui <yabinc@google.com> 1488913738 +0000
committer android-build-merger <android-build-merger@google.com> 1488913738 +0000

Merge "simpleperf: adjust sample_freq based on max_sample_rate file." am: 8e9eabe7f4
am: d2b9b31a63

Change-Id: Ieb0498aff61487ab773b8c257124fc2543b4fea9