summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-09 11:07:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-09 11:07:43 +0000
commit0e2b9ea2cfa37885810dce287f7bf2dbbbcf9f13 (patch)
treedd72a84514306c5cc0c9025a1fb9e9e3976ced32
parent48c1a33a578bc90fb53784cdc1851f3ca1e60053 (diff)
parentd4db8539b78afb2055c534de82af71c601a4e2f7 (diff)
downloadextras-0e2b9ea2cfa37885810dce287f7bf2dbbbcf9f13.tar.gz
Merge changes from topic "am-1ea4a23d68d44c7d84ed87e3618c6553" into android12-tests-dev
* changes: Merge "[automerger skipped] Merge "simpleperf: increase record duration" into android10-tests-dev am: f33a791c40 -s ours" into android11-tests-dev am: ce9f7a6ae9 [automerger skipped] Merge "simpleperf: increase record duration" into android10-tests-dev am: f33a791c40 -s ours am: 1d1575720f -s ours
0 files changed, 0 insertions, 0 deletions