tree cffb2775de399aa5190fccdbf00b26712d1931df
parent 8199fb33b3f0aa5f5a53eab599ba83f9a3ba3765
parent f6119e9049b5fd823ecbc10d00767afbce11d53c
author Eduard Olteanu <eduardolteanu@google.com> 1695157871 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695157871 +0000

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

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

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