tree 78c0c9f84843ab122bd616e7256ae45d500e73f0
parent 6ca4dce1fb8f17e07cea89615b0ddac994b33fda
parent b4b786ca611bc01daeab3a9e40db03885840ee20
author Elliott Hughes <enh@google.com> 1620785681 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620785681 +0000

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

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

Change-Id: I032949d2e2d8beb086a62e4dfdf789f7fb3d6eb5