tree c15250b1d93261cec8eb7855a50f009b45a95e77
parent 9a207c0c12299f9a908f3e95908bcf1b776c02d5
parent 8c15f1a834f37ba407bfe33cea4cc72431d3ad7f
author Cole Faust <colefaust@google.com> 1649971476 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649971476 +0000

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

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

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