tree 94f25905cbb5b1f5f6fbc087e5224f2ff8cb9e87
parent ecb8636406ec1c4c89e721e38d570e8c19bba866
parent e28c176293559e79bccf3235d816a1885113ac53
author Eduard Olteanu <eduardolteanu@google.com> 1695148482 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695148482 +0000

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

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

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