tree 78c0c9f84843ab122bd616e7256ae45d500e73f0
parent 0d8f8223c1766e377841386ce72b3db092f349ee
parent 9c9ce2caf4fe89227ce46a011d08d0b9eefecf14
author Elliott Hughes <enh@google.com> 1620783044 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620783044 +0000

Merge tag 'v1.2.1' into update am: 7269cd8246 am: 8fe4f5452d am: 9c9ce2caf4

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

Change-Id: I81387339ff8ff94cd15f354b08c154b3447fbb64