summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2011-01-25 19:01:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-25 19:01:33 -0800
commit11d43082c587523ba205c10202b9cf33d0b072fe (patch)
tree80f05cab20e5da66446abafb3b71b5e9a822797e /data
parent3ae881ffc775b2eba78a22e0cf1b59a9104f0e22 (diff)
parentc88b19fcc847cc5249e88672337ae5879b0af338 (diff)
downloadframeworks_base-11d43082c587523ba205c10202b9cf33d0b072fe.zip
frameworks_base-11d43082c587523ba205c10202b9cf33d0b072fe.tar.gz
frameworks_base-11d43082c587523ba205c10202b9cf33d0b072fe.tar.bz2
am c88b19fc: am 34430260: Merge "Fit and finish on status bar:" into honeycomb
* commit 'c88b19fcc847cc5249e88672337ae5879b0af338': Fit and finish on status bar:
Diffstat (limited to 'data')
-rw-r--r--data/fonts/AndroidClock_Solid.ttf (renamed from data/fonts/AndroidClock-Solid.ttf)bin2652 -> 2652 bytes
-rw-r--r--data/fonts/fonts.mk3
2 files changed, 2 insertions, 1 deletions
diff --git a/data/fonts/AndroidClock-Solid.ttf b/data/fonts/AndroidClock_Solid.ttf
index 108839e..108839e 100644
--- a/data/fonts/AndroidClock-Solid.ttf
+++ b/data/fonts/AndroidClock_Solid.ttf
Binary files differ
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index b8a93e8..faecfee 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -28,4 +28,5 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \
frameworks/base/data/fonts/DroidSansFallback.ttf:system/fonts/DroidSansFallback.ttf \
frameworks/base/data/fonts/AndroidClock.ttf:system/fonts/AndroidClock.ttf \
- frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Highlight.ttf
+ frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Highlight.ttf \
+ frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Solid.ttf