tree 2c9ea3646450d28c930b1f5f943e4fb19476f2eb
parent 45fe8a68e26bd99e2bca1a9a28d86c07af463147
parent 70ad10b154e6a4cf0e8b9967d2bdeb0cad0758ee
author Treehugger Robot <treehugger-gerrit@google.com> 1650508885 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650508885 +0000

[automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours am: 2b889498a2 -s ours am: c18b24e749 -s ours am: 75792a6ec3 -s ours am: 036425ff0e -s ours am: 46e1d974b2 -s ours am: 8edd9eeabd -s ours am: 70ad10b154 -s ours

am skip reason: skipped by user robinjacob

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

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