Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: I684153edd08550fb2745176746098789472babc7
diff --git a/Android.mk b/Android.mk
index a417f2e..6726db3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,8 +32,16 @@
#############################################################################
ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
font_src_files += \
+ NotoSansBalinese-Regular.ttf \
+ NotoSansBatak-Regular.ttf \
+ NotoSansBuginese-Regular.ttf \
+ NotoSansBuhid-Regular.ttf \
NotoSansCanadianAboriginal-Regular.ttf \
+ NotoSansCham-Regular.ttf \
+ NotoSansCham-Bold.ttf \
NotoSansCherokee-Regular.ttf \
+ NotoSansCoptic-Regular.ttf \
+ NotoSansGlagolitic-Regular.ttf \
NotoSansGujarati-Regular.ttf \
NotoSansGujarati-Bold.ttf \
NotoSansGujaratiUI-Regular.ttf \
@@ -44,12 +52,32 @@
NotoSansGurmukhiUI-Bold.ttf \
NotoSansHans-Regular.otf \
NotoSansHant-Regular.otf \
+ NotoSansHanunoo-Regular.ttf \
+ NotoSansJavanese-Regular.ttf \
+ NotoSansKayahLi-Regular.ttf \
NotoSansKR-Regular.otf \
+ NotoSansLepcha-Regular.ttf \
+ NotoSansLimbu-Regular.ttf \
+ NotoSansMeeteiMayek-Regular.ttf \
+ NotoSansOlChiki-Regular.ttf \
+ NotoSansRejang-Regular.ttf \
+ NotoSansSaurashtra-Regular.ttf \
+ NotoSansSundanese-Regular.ttf \
NotoSansSinhala-Regular.ttf \
NotoSansSinhala-Bold.ttf \
+ NotoSansSylotiNagri-Regular.ttf \
+ NotoSansTagbanwa-Regular.ttf \
+ NotoSansTaiLe-Regular.ttf \
+ NotoSansTaiTham-Regular.ttf \
+ NotoSansTaiViet-Regular.ttf \
+ NotoSansThaana-Regular.ttf \
+ NotoSansThaana-Bold.ttf \
+ NotoSansTifinagh-Regular.ttf \
NotoSansYi-Regular.ttf
endif # EXTENDED_FONT_FOOTPRINT
+
+
#############################################################################
# The following fonts are excluded from SMALLER_FONT_FOOTPRINT builds
#############################################################################
diff --git a/NotoColorEmoji-Subsetted.ttf b/NotoColorEmoji-Subsetted.ttf
index 29bb355..112a4d5 100644
--- a/NotoColorEmoji-Subsetted.ttf
+++ b/NotoColorEmoji-Subsetted.ttf
Binary files differ
diff --git a/NotoColorEmoji.ttf b/NotoColorEmoji.ttf
index c6d61ae..5b248cc 100644
--- a/NotoColorEmoji.ttf
+++ b/NotoColorEmoji.ttf
Binary files differ
diff --git a/NotoSansBalinese-Regular.ttf b/NotoSansBalinese-Regular.ttf
new file mode 100644
index 0000000..5298392
--- /dev/null
+++ b/NotoSansBalinese-Regular.ttf
Binary files differ
diff --git a/NotoSansBatak-Regular.ttf b/NotoSansBatak-Regular.ttf
new file mode 100644
index 0000000..bb2ab92
--- /dev/null
+++ b/NotoSansBatak-Regular.ttf
Binary files differ
diff --git a/NotoSansBuginese-Regular.ttf b/NotoSansBuginese-Regular.ttf
new file mode 100644
index 0000000..dba9783
--- /dev/null
+++ b/NotoSansBuginese-Regular.ttf
Binary files differ
diff --git a/NotoSansBuhid-Regular.ttf b/NotoSansBuhid-Regular.ttf
new file mode 100644
index 0000000..84b656a
--- /dev/null
+++ b/NotoSansBuhid-Regular.ttf
Binary files differ
diff --git a/NotoSansCham-Bold.ttf b/NotoSansCham-Bold.ttf
new file mode 100644
index 0000000..a71469c
--- /dev/null
+++ b/NotoSansCham-Bold.ttf
Binary files differ
diff --git a/NotoSansCham-Regular.ttf b/NotoSansCham-Regular.ttf
new file mode 100644
index 0000000..937606d
--- /dev/null
+++ b/NotoSansCham-Regular.ttf
Binary files differ
diff --git a/NotoSansCoptic-Regular.ttf b/NotoSansCoptic-Regular.ttf
new file mode 100644
index 0000000..f47a40c
--- /dev/null
+++ b/NotoSansCoptic-Regular.ttf
Binary files differ
diff --git a/NotoSansGlagolitic-Regular.ttf b/NotoSansGlagolitic-Regular.ttf
new file mode 100644
index 0000000..d85b301
--- /dev/null
+++ b/NotoSansGlagolitic-Regular.ttf
Binary files differ
diff --git a/NotoSansHans-Regular.otf b/NotoSansHans-Regular.otf
index 098d3d4..dfc0a62 100644
--- a/NotoSansHans-Regular.otf
+++ b/NotoSansHans-Regular.otf
Binary files differ
diff --git a/NotoSansHanunoo-Regular.ttf b/NotoSansHanunoo-Regular.ttf
new file mode 100644
index 0000000..57a22b7
--- /dev/null
+++ b/NotoSansHanunoo-Regular.ttf
Binary files differ
diff --git a/NotoSansJavanese-Regular.ttf b/NotoSansJavanese-Regular.ttf
new file mode 100644
index 0000000..96ac014
--- /dev/null
+++ b/NotoSansJavanese-Regular.ttf
Binary files differ
diff --git a/NotoSansKR-Regular.otf b/NotoSansKR-Regular.otf
index 4e164ea..4ad6ef3 100644
--- a/NotoSansKR-Regular.otf
+++ b/NotoSansKR-Regular.otf
Binary files differ
diff --git a/NotoSansKayahLi-Regular.ttf b/NotoSansKayahLi-Regular.ttf
new file mode 100644
index 0000000..97f21f3
--- /dev/null
+++ b/NotoSansKayahLi-Regular.ttf
Binary files differ
diff --git a/NotoSansLepcha-Regular.ttf b/NotoSansLepcha-Regular.ttf
new file mode 100644
index 0000000..4d3b1ad
--- /dev/null
+++ b/NotoSansLepcha-Regular.ttf
Binary files differ
diff --git a/NotoSansLimbu-Regular.ttf b/NotoSansLimbu-Regular.ttf
new file mode 100644
index 0000000..40f7c89
--- /dev/null
+++ b/NotoSansLimbu-Regular.ttf
Binary files differ
diff --git a/NotoSansMeeteiMayek-Regular.ttf b/NotoSansMeeteiMayek-Regular.ttf
new file mode 100644
index 0000000..b5a364a
--- /dev/null
+++ b/NotoSansMeeteiMayek-Regular.ttf
Binary files differ
diff --git a/NotoSansOlChiki-Regular.ttf b/NotoSansOlChiki-Regular.ttf
new file mode 100644
index 0000000..76fbe6e
--- /dev/null
+++ b/NotoSansOlChiki-Regular.ttf
Binary files differ
diff --git a/NotoSansRejang-Regular.ttf b/NotoSansRejang-Regular.ttf
new file mode 100644
index 0000000..04c5ab9
--- /dev/null
+++ b/NotoSansRejang-Regular.ttf
Binary files differ
diff --git a/NotoSansSaurashtra-Regular.ttf b/NotoSansSaurashtra-Regular.ttf
new file mode 100644
index 0000000..ea7bc83
--- /dev/null
+++ b/NotoSansSaurashtra-Regular.ttf
Binary files differ
diff --git a/NotoSansSundanese-Regular.ttf b/NotoSansSundanese-Regular.ttf
new file mode 100644
index 0000000..7549d1a
--- /dev/null
+++ b/NotoSansSundanese-Regular.ttf
Binary files differ
diff --git a/NotoSansSylotiNagri-Regular.ttf b/NotoSansSylotiNagri-Regular.ttf
new file mode 100644
index 0000000..a831ebe
--- /dev/null
+++ b/NotoSansSylotiNagri-Regular.ttf
Binary files differ
diff --git a/NotoSansTagbanwa-Regular.ttf b/NotoSansTagbanwa-Regular.ttf
new file mode 100644
index 0000000..3aaf4f0
--- /dev/null
+++ b/NotoSansTagbanwa-Regular.ttf
Binary files differ
diff --git a/NotoSansTaiLe-Regular.ttf b/NotoSansTaiLe-Regular.ttf
new file mode 100644
index 0000000..0f59524
--- /dev/null
+++ b/NotoSansTaiLe-Regular.ttf
Binary files differ
diff --git a/NotoSansTaiTham-Regular.ttf b/NotoSansTaiTham-Regular.ttf
new file mode 100644
index 0000000..821499c
--- /dev/null
+++ b/NotoSansTaiTham-Regular.ttf
Binary files differ
diff --git a/NotoSansTaiViet-Regular.ttf b/NotoSansTaiViet-Regular.ttf
new file mode 100644
index 0000000..d08fb43
--- /dev/null
+++ b/NotoSansTaiViet-Regular.ttf
Binary files differ
diff --git a/NotoSansThaana-Bold.ttf b/NotoSansThaana-Bold.ttf
new file mode 100644
index 0000000..6dd59be
--- /dev/null
+++ b/NotoSansThaana-Bold.ttf
Binary files differ
diff --git a/NotoSansThaana-Regular.ttf b/NotoSansThaana-Regular.ttf
new file mode 100644
index 0000000..01ecfe2
--- /dev/null
+++ b/NotoSansThaana-Regular.ttf
Binary files differ
diff --git a/NotoSansTifinagh-Regular.ttf b/NotoSansTifinagh-Regular.ttf
new file mode 100644
index 0000000..1866e55
--- /dev/null
+++ b/NotoSansTifinagh-Regular.ttf
Binary files differ
diff --git a/fonts.mk b/fonts.mk
index 27677ae..fb5bc67 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -24,12 +24,19 @@
NotoNaskhUI-Bold.ttf \
NotoSansArmenian-Regular.ttf \
NotoSansArmenian-Bold.ttf \
+ NotoSansBalinese-Regular.ttf \
+ NotoSansBatak-Regular.ttf \
NotoSansBengali-Regular.ttf \
NotoSansBengali-Bold.ttf \
NotoSansBengaliUI-Regular.ttf \
NotoSansBengaliUI-Bold.ttf \
+ NotoSansBuginese-Regular.ttf \
+ NotoSansBuhid-Regular.ttf \
NotoSansCanadianAboriginal-Regular.ttf \
+ NotoSansCham-Regular.ttf \
+ NotoSansCham-Bold.ttf \
NotoSansCherokee-Regular.ttf \
+ NotoSansCoptic-Regular.ttf \
NotoSansDevanagari-Regular.ttf \
NotoSansDevanagari-Bold.ttf \
NotoSansDevanagariUI-Regular.ttf \
@@ -38,6 +45,7 @@
NotoSansEthiopic-Bold.ttf \
NotoSansGeorgian-Regular.ttf \
NotoSansGeorgian-Bold.ttf \
+ NotoSansGlagolitic-Regular.ttf \
NotoSansGujarati-Regular.ttf \
NotoSansGujarati-Bold.ttf \
NotoSansGujaratiUI-Regular.ttf \
@@ -48,13 +56,16 @@
NotoSansGurmukhiUI-Bold.ttf \
NotoSansHans-Regular.otf \
NotoSansHant-Regular.otf \
+ NotoSansHanunoo-Regular.ttf \
NotoSansHebrew-Regular.ttf \
NotoSansHebrew-Bold.ttf \
+ NotoSansJavanese-Regular.ttf \
NotoSansJP-Regular.otf \
NotoSansKannada-Regular.ttf \
NotoSansKannada-Bold.ttf \
NotoSansKannadaUI-Regular.ttf \
NotoSansKannadaUI-Bold.ttf \
+ NotoSansKayahLi-Regular.ttf \
NotoSansKhmer-Regular.ttf \
NotoSansKhmer-Bold.ttf \
NotoSansKhmerUI-Regular.ttf \
@@ -64,17 +75,29 @@
NotoSansLao-Bold.ttf \
NotoSansLaoUI-Regular.ttf \
NotoSansLaoUI-Bold.ttf \
+ NotoSansLepcha-Regular.ttf \
+ NotoSansLimbu-Regular.ttf \
NotoSansMalayalam-Regular.ttf \
NotoSansMalayalam-Bold.ttf \
NotoSansMalayalamUI-Regular.ttf \
NotoSansMalayalamUI-Bold.ttf \
+ NotoSansMeeteiMayek-Regular.ttf \
NotoSansMyanmar-Regular.ttf \
NotoSansMyanmar-Bold.ttf \
NotoSansMyanmarUI-Regular.ttf \
NotoSansMyanmarUI-Bold.ttf \
+ NotoSansOlChiki-Regular.ttf \
+ NotoSansRejang-Regular.ttf \
+ NotoSansSaurashtra-Regular.ttf \
NotoSansSinhala-Regular.ttf \
NotoSansSinhala-Bold.ttf \
+ NotoSansSundanese-Regular.ttf \
+ NotoSansSylotiNagri-Regular.ttf \
NotoSansSymbols-Regular-Subsetted.ttf \
+ NotoSansTagbanwa-Regular.ttf \
+ NotoSansTaiLe-Regular.ttf \
+ NotoSansTaiTham-Regular.ttf \
+ NotoSansTaiViet-Regular.ttf \
NotoSansTamil-Regular.ttf \
NotoSansTamil-Bold.ttf \
NotoSansTamilUI-Regular.ttf \
@@ -83,10 +106,13 @@
NotoSansTelugu-Bold.ttf \
NotoSansTeluguUI-Regular.ttf \
NotoSansTeluguUI-Bold.ttf \
+ NotoSansThaana-Regular.ttf \
+ NotoSansThaana-Bold.ttf \
NotoSansThai-Regular.ttf \
NotoSansThai-Bold.ttf \
NotoSansThaiUI-Regular.ttf \
NotoSansThaiUI-Bold.ttf \
+ NotoSansTifinagh-Regular.ttf \
NotoSansYi-Regular.ttf \
NotoSerif-Regular.ttf \
NotoSerif-Bold.ttf \