tree 2d788f9c5db7ca8b7e5c0dc10aa1c694c2daefd6
parent c7ff722547ab5fda793b8d9be1ccf3453436a0c9
parent b0ab857477b9fc626299152a7112cfe8fb746205
author Eric Biggers <ebiggers@google.com> 1740079402 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1740079402 -0800

Merge changes I504a4667,Ib935ada9,Id3324fda,I8ca1cee4 into main am: d749c85750 am: b0ab857477

Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/3490488

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