Merge SP1A.210311.001

Change-Id: I5e05327e7df85ba628e8b28481bd14bcfd6755a3

3 files changed, 3 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 7bb241b..e4ce4c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,6 +47,6 @@ license {
 }
 
 prebuilt_font {
-    name: "CutiveMono.ttf",
-    src: "CutiveMono.ttf",
+    name: "CutiveMono-Regular.ttf",
+    src: "CutiveMono-Regular.ttf",
 }
diff --git a/CutiveMono.ttf b/CutiveMono-Regular.ttf
index efe0f33..efe0f33 100644
--- a/CutiveMono.ttf
+++ b/CutiveMono-Regular.ttf
diff --git a/fonts.mk b/fonts.mk
index 9b463ab..d00eb71 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -17,4 +17,4 @@
 # get installed too.
 
 PRODUCT_PACKAGES := \
-    CutiveMono.ttf
+    CutiveMono-Regular.ttf