tree fa795a0a463d2d219e83281844b3ea3bc7f24361
parent 1aa597e1b577092902669e509c336b76d1b0d331
parent 848d294253ef715d80cc0d0c7bd0022884a1430c
author Yabin Cui <yabinc@google.com> 1495217310 +0000
committer android-build-merger <android-build-merger@google.com> 1495217310 +0000

Merge "simpleperf: enable two options by default." am: 7386d10cce
am: 848d294253

Change-Id: Ica2596c99204bcf7299f1eb431f37cbc3a0077b4