tree dd72a84514306c5cc0c9025a1fb9e9e3976ced32
parent 62b1150e9c5c70bd621fdc722e803910ae7a1242
parent e75300a81b33afeb817dbd998c040a4e3e81a5f2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633712921 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1633712921 +0000

Merge changes from topic "am-e2191be8e914422aad1bbf4605902997" into android12-tests-dev

* changes:
  Merge "[automerger skipped] Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters." into android10-tests-dev am: aa57fd3ff3 -s ours" into android11-tests-dev am: ef1baf5351
  [automerger skipped] Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters." into android10-tests-dev am: aa57fd3ff3 -s ours am: 6febe6dc28 -s ours