tree cffb2775de399aa5190fccdbf00b26712d1931df
parent 801d564c93451b634065b52c8550ab76dcd89742
parent 2e8013f3ceef2e4ac110a3cd6772cd4bd32ade60
author Eduard Olteanu <eduardolteanu@google.com> 1695154516 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695154516 +0000

Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610

Change-Id: I7c57005c0b7fbd851e76a9920c2088dec0a78f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>