tree 55936879566df06fe9642905fc632bc0e326bed3
parent 0333368700b5d40bb1e33c784611efb98394ab3e
parent 73668388e3a2c141c40b7576b9a2abaab215a580
author Yabin Cui <yabinc@google.com> 1516660402 +0000
committer android-build-merger <android-build-merger@google.com> 1516660402 +0000

Merge "simpleperf: temporarily disable handling cpu hotplug in record cmd." am: 3cd1778cdf am: d497110c46
am: 73668388e3

Change-Id: I5da0a6548cdf3fbe4794e04f5dceadf0fc01eb73