Merge SP1A.210407.002

Change-Id: I2de1f6302b748de5d6fe4315c8ddb50258e4ebc9

3 files changed, 3 insertions, 3 deletions

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