summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-06-02 18:08:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-02 18:08:19 +0000
commit88554f5f7d630a1298894654bcab3669a20e6d88 (patch)
tree46e9f967263c66394951138c4c2fb6aa4b7af65a /data
parentdcdd150e6c5d9c6df10b7bc49612c879d1808f6d (diff)
parenta9efb284088cf52a3819cdf88ff6cc4109e517ca (diff)
downloadframeworks_base-88554f5f7d630a1298894654bcab3669a20e6d88.zip
frameworks_base-88554f5f7d630a1298894654bcab3669a20e6d88.tar.gz
frameworks_base-88554f5f7d630a1298894654bcab3669a20e6d88.tar.bz2
am dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev
* commit 'dfc40743fda406614a2200a31e8a670b7fa46cd8': Revert ascent/descent/lineGap of Roboto to Roboto v1 values
Diffstat (limited to 'data')
-rw-r--r--data/fonts/Roboto-Black.ttfbin127948 -> 127948 bytes
-rw-r--r--data/fonts/Roboto-Bold.ttfbin127744 -> 127744 bytes
-rw-r--r--data/fonts/Roboto-BoldItalic.ttfbin134556 -> 134556 bytes
-rw-r--r--data/fonts/Roboto-Italic.ttfbin132440 -> 132440 bytes
-rw-r--r--data/fonts/Roboto-Light.ttfbin126792 -> 126792 bytes
-rw-r--r--data/fonts/Roboto-LightItalic.ttfbin133172 -> 133172 bytes
-rw-r--r--data/fonts/Roboto-Medium.ttfbin127488 -> 127488 bytes
-rw-r--r--data/fonts/Roboto-MediumItalic.ttfbin134312 -> 134312 bytes
-rw-r--r--data/fonts/Roboto-Regular.ttfbin126072 -> 126072 bytes
-rw-r--r--data/fonts/Roboto-Thin.ttfbin127584 -> 127584 bytes
-rw-r--r--data/fonts/Roboto-ThinItalic.ttfbin132860 -> 132860 bytes
-rw-r--r--data/fonts/RobotoCondensed-Bold.ttfbin127340 -> 127340 bytes
-rw-r--r--data/fonts/RobotoCondensed-BoldItalic.ttfbin135504 -> 135504 bytes
-rw-r--r--data/fonts/RobotoCondensed-Italic.ttfbin133908 -> 133908 bytes
-rw-r--r--data/fonts/RobotoCondensed-Light.ttfbin126168 -> 126168 bytes
-rw-r--r--data/fonts/RobotoCondensed-LightItalic.ttfbin134544 -> 134544 bytes
-rw-r--r--data/fonts/RobotoCondensed-Regular.ttfbin125332 -> 125332 bytes
17 files changed, 0 insertions, 0 deletions
diff --git a/data/fonts/Roboto-Black.ttf b/data/fonts/Roboto-Black.ttf
index 2cdbe43..cb905bc 100644
--- a/data/fonts/Roboto-Black.ttf
+++ b/data/fonts/Roboto-Black.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf
index 15c9b4e..68822ca 100644
--- a/data/fonts/Roboto-Bold.ttf
+++ b/data/fonts/Roboto-Bold.ttf
Binary files differ
diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf
index a0abf30..aebf8eb 100644
--- a/data/fonts/Roboto-BoldItalic.ttf
+++ b/data/fonts/Roboto-BoldItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf
index 67b5394..2041cbc 100644
--- a/data/fonts/Roboto-Italic.ttf
+++ b/data/fonts/Roboto-Italic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf
index d9fb64a..aa45340 100644
--- a/data/fonts/Roboto-Light.ttf
+++ b/data/fonts/Roboto-Light.ttf
Binary files differ
diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf
index 1fd1d31..a85444f 100644
--- a/data/fonts/Roboto-LightItalic.ttf
+++ b/data/fonts/Roboto-LightItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf
index c63c115..a3c1a1f 100644
--- a/data/fonts/Roboto-Medium.ttf
+++ b/data/fonts/Roboto-Medium.ttf
Binary files differ
diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf
index cd7c835..a30aa0c 100644
--- a/data/fonts/Roboto-MediumItalic.ttf
+++ b/data/fonts/Roboto-MediumItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf
index 9cb4a5a..0e58508 100644
--- a/data/fonts/Roboto-Regular.ttf
+++ b/data/fonts/Roboto-Regular.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf
index f02f100..8779333 100644
--- a/data/fonts/Roboto-Thin.ttf
+++ b/data/fonts/Roboto-Thin.ttf
Binary files differ
diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf
index 12a2ce0..b79cb26 100644
--- a/data/fonts/Roboto-ThinItalic.ttf
+++ b/data/fonts/Roboto-ThinItalic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf
index 1079af6..3e06c7c 100644
--- a/data/fonts/RobotoCondensed-Bold.ttf
+++ b/data/fonts/RobotoCondensed-Bold.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf
index e7f13c2..aaf9fe0 100644
--- a/data/fonts/RobotoCondensed-BoldItalic.ttf
+++ b/data/fonts/RobotoCondensed-BoldItalic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf
index 7fa0448..d2b611f 100644
--- a/data/fonts/RobotoCondensed-Italic.ttf
+++ b/data/fonts/RobotoCondensed-Italic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf
index 96b75dd..d4eb198 100644
--- a/data/fonts/RobotoCondensed-Light.ttf
+++ b/data/fonts/RobotoCondensed-Light.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf
index 7a2c164..a08f3f4 100644
--- a/data/fonts/RobotoCondensed-LightItalic.ttf
+++ b/data/fonts/RobotoCondensed-LightItalic.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf
index 734cc40..b9fc49c 100644
--- a/data/fonts/RobotoCondensed-Regular.ttf
+++ b/data/fonts/RobotoCondensed-Regular.ttf
Binary files differ