tree 666705ad840b627c1be062d4b9696820d22882ca
parent 12ad09c63dce5f7dc7017bc09abfa48cb9902786
parent 458e637910b288ea46994c701a7e1633afafc6f7
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639685741 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1639685741 +0000

Merge changes from topic "am-5ff3768a92d443d1939e70a1909e20ed" into android12-tests-dev

* changes:
  Merge "simpleperf: Loose time constraint to fix flaky test." into android11-tests-dev am: a3e6140e6a
  simpleperf: Loose time constraint to fix flaky test. am: 79810fc160