tree 8233a74ab6d7f05b408d816ff174502b9c154b75
parent 4517732b40d85d211ade7f74a8dd79c28a1468bd
parent 6f08b2a7be70965b4400ea1d47ea9a043780f6b9
author Kelvin Zhang <zhangkelvin@google.com> 1657840564 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657840564 +0000

Merge remote-tracking branch 'aosp/upstream-master' into dev am: 6f08b2a7be

Original change: https://android-review.googlesource.com/c/platform/external/erofs-utils/+/2151833

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