tree a48167de1f17700e14d471e030988cc2fd02af8d
parent 9d770131dcd7b093beee75fb39a22ccdd0736869
parent 945eeca235a340803aeb0e7aca6b28612ec7559e
author Yabin Cui <yabinc@google.com> 1509644278 +0000
committer android-build-merger <android-build-merger@google.com> 1509644278 +0000

Merge "simpleperf: avoid warning for default freq." am: 6e0851e917
am: 945eeca235

Change-Id: I0e8455d6123af89bb65481c92cc0aaf45ce406ad