tree 956db483ee8a76837425a81c0d3cb4dc24e27ef4
parent 69038fdcaf9c524379176d435a6387156f2e1eea
parent bdc7bdab690adf1fecba86d03b12c3ca882d8e42
author Cole Faust <colefaust@google.com> 1649973704 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649973704 +0000

Merge "Fix more issues with python3 conversion of build_verity_metadata.py" am: 4e69dcd3fa am: 8c15f1a834 am: 583ce8b45d am: bdc7bdab69

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888

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