tree 7a8e153f6988f95aecf58c861e04aca304291866
parent 689290a182c06585730bb142fdd355b3e22746ca
parent 51349daf08048af7200984caa131aa51fb7baa2b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682531120 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682531120 +0000

[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours

am skip reason: skipped by user dvander

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

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