tree 18440c1e64c88de64167db4afa4fa03f50f96433
parent 8a1580499f5cf7ddb92618bb2703b85062326a87
parent 9dc8ca5a41c0a937ab34200f12aab1b8b78c8d91
author Treehugger Robot <treehugger-gerrit@google.com> 1614586405 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614586405 +0000

[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc am: 4de32b2fb2 am: 9dc8ca5a41 -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: I38368afb55f0b0656ebd78d3a4f5c861461cb1d9