tree d29603b9a4427e5b4d3a68a904b6488e919b9bd0
parent d73b4aa2f9782e8151d31593576592d8da0da570
parent ab913fe979caebeaf2df8045355d3fa8dfa62c3b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682532759 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682532759 +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: ab913fe979 -s ours

am skip reason: skipped by user dvander

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

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