tree 8014432a439725a89eb99bef62b9372322383a5a
parent 062630064dd446cd28607867c475470f0983f057
parent 536541250f9042a034734f54dabb8ed40d3e70f4
author Treehugger Robot <treehugger-gerrit@google.com> 1614618723 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614618723 +0000

[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc am: 4de32b2fb2 am: 9dc8ca5a41 -s ours am: 536541250f -s ours

am skip reason: Change-Id Ie1e2f9ee85625216be6b2cb0781df34faec97673 with SHA-1 0a4e828357 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8640e934636a0139199ab37240d626112eebe8f4