tree edab3b2b5dd1670c6554ca706d2d4dca62d4d744
parent 052f879735f9fd7920618c7077cdaf4b0b0b0af1
parent 534267bd91d5f0f856155a5c5972ae2b2870381f
author Yabin Cui <yabinc@google.com> 1584554570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584554570 +0000

Merge "simpleperf: fix flaky record_native_app test." am: 0b9f8de9be am: 534267bd91

Change-Id: Iade90f965facf1ef152884e792aa4e8a1b8b3659