tree c0a3cc75186fdaa4eccb877e164ed1043bb77f5b
parent 5c15f94f791b0125ca2047371adec28d99f0b101
parent 131557b166275779d8c29ee34fea34db6bcc90ed
author Treehugger Robot <treehugger-gerrit@google.com> 1617233384 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617233384 +0000

[automerger skipped] Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd1550 am: 5efafd667a am: 131557b166 -s ours

am skip reason: skip tag Change-Id I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1 with SHA-1 a1245b1c7c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I32efb73124006edc49206b039d74f91068c33ea7