tree 4e65696ea1589fd5c865def17982f700b4561303
parent 76cecfc7ed00e7174fce8181807f63b4237edc22
parent 190ea5fba24739a0adf649f4295fa78fcb809b67
author Yabin Cui <yabinc@google.com> 1642006227 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642006227 +0000

Merge "simpleperf: fix mac build." am: 116d229784 am: 190ea5fba2

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1946130

Change-Id: I8b28b71c3aca4f2531350d22a94fda884e7348cb