summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2011-01-26 09:40:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 09:40:47 -0800
commit970e94cdd1a3702d9bb035a91e0028b6d28b923e (patch)
treedc91f03bd29d52858369a65f0343e46c37aa3857 /data
parent4ff8f51ef20e23129f3b24c472627e0148f7b217 (diff)
parentf96e0eb49f7ed4f49a1a9ea3e256f1280851207e (diff)
downloadframeworks_base-970e94cdd1a3702d9bb035a91e0028b6d28b923e.zip
frameworks_base-970e94cdd1a3702d9bb035a91e0028b6d28b923e.tar.gz
frameworks_base-970e94cdd1a3702d9bb035a91e0028b6d28b923e.tar.bz2
am f96e0eb4: am 66a9f48b: Merge "Wrong clock font in system bar. Whoops." into honeycomb
* commit 'f96e0eb49f7ed4f49a1a9ea3e256f1280851207e': Wrong clock font in system bar. Whoops.
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fonts.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index faecfee..692ce34 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -29,4 +29,4 @@ PRODUCT_COPY_FILES := \
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_Solid.ttf
+ frameworks/base/data/fonts/AndroidClock_Solid.ttf:system/fonts/AndroidClock_Solid.ttf