tree b6a35cca7352696288bb0b4e1b3dfea3fee2a90f
parent b1d477e56fefaa6653a9b4ba197787842edf665d
parent e807efd1ea4777b746cb4fc2b53a76ed10bf455e
author Treehugger Robot <treehugger-gerrit@google.com> 1617234543 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617234543 +0000

[automerger skipped] Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390 am: 4810c99f09 am: 20c3f60afe -s ours am: e807efd1ea -s ours

am skip reason: skip tag Change-Id I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3 with SHA-1 8929f899ac is already in history

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

Change-Id: Ica8ab6d265a06b79c95d215a691dd12125adf251