merge from eclair

13 files changed, 440 insertions, 2 deletions

diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index e2359257..8c76ab4d 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -38,8 +38,8 @@ LOCAL_PATH:= $(call my-dir)
 
 # Build configuration:
 #
-# Japanese wins if required.
-# "Large" includes most other languages.
+# "Large" includes all the supported locales.
+# Japanese includes US and Japan.
 # US-Euro is needed for IT or PL builds
 # Default is suitable for CS, DE, EN, ES, FR, NL
 # US has only EN and ES
diff --git a/stubdata/cfg-large/icudt38l.txt b/stubdata/cfg-large/icudt38l.txt
index 5132372d..0663526b 100644
--- a/stubdata/cfg-large/icudt38l.txt
+++ b/stubdata/cfg-large/icudt38l.txt
@@ -2,6 +2,7 @@ brkitr/char.brk
 brkitr/en.res
 brkitr/en_US.res
 brkitr/en_US_POSIX.res
+brkitr/ja.res
 brkitr/line.brk
 brkitr/res_index.res
 brkitr/root.res
@@ -9,6 +10,7 @@ brkitr/sent.brk
 brkitr/title.brk
 brkitr/word.brk
 brkitr/word_POSIX.brk
+brkitr/word_ja.brk
 
 coll/cs.res
 coll/cs_CZ.res
@@ -45,11 +47,22 @@ coll/fr_FR.res
 coll/it.res
 coll/it_CH.res
 coll/it_IT.res
+coll/ja.res
+coll/ja_JP.res
 coll/nl.res
 coll/nl_BE.res
 coll/nl_NL.res
 coll/pl.res
 coll/pl_PL.res
+coll/zh.res
+coll/zh_Hans.res
+coll/zh_Hant.res
+coll/zh_CN.res
+coll/zh_Hans_CN.res
+coll/zh_TW.res
+coll/zh_Hant_TW.res
+coll/zh_HK.res
+coll/zh_Hant_HK.res
 coll/res_index.res
 coll/root.res
 
@@ -59,6 +72,7 @@ rbnf/en_GB.res
 rbnf/es.res
 rbnf/fr.res
 rbnf/it.res
+rbnf/ja.res
 rbnf/nl.res
 rbnf/pl.res
 rbnf/res_index.res
@@ -120,6 +134,9 @@ id.res
 it.res
 it_CH.res
 it_IT.res
+ja.res
+ja_JP.res
+ja_JP_TRADITIONAL.res
 ko.res
 ko_KR.res
 nb.res
@@ -186,6 +203,12 @@ windows-936-2000.cnv
 windows-949-2000.cnv
 windows-950-2000.cnv
 
+docomo-shift_jis-2007.cnv
+kddi-jisx-208-2007.cnv
+kddi-shift_jis-2007.cnv
+softbank-jisx-208-2007.cnv
+softbank-shift_jis-2007.cnv
+
 cnvalias.icu
 invuca.icu
 pnames.icu
diff --git a/stubdata/cfg-large/icudt38l/brkitr/res_index.txt b/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
index 8f775925..84613daf 100644
--- a/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
@@ -4,5 +4,7 @@ res_index:table(nofallback) {
         en {""}
         en_US {""}
         en_US_POSIX {""}
+
+        ja {""}
     }
 }
diff --git a/stubdata/cfg-large/icudt38l/coll/res_index.txt b/stubdata/cfg-large/icudt38l/coll/res_index.txt
index 3ccacbff..e45b9d1d 100644
--- a/stubdata/cfg-large/icudt38l/coll/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/coll/res_index.txt
@@ -52,5 +52,18 @@ res_index:table(nofallback) {
         
         pl {""}
         pl_PL {""}
+
+        ja {""}
+        ja_JP {""}
+
+        zh {""}
+        zh_Hans {""}
+        zh_Hans_CN {""}
+        zh_CN {""}
+        zh_Hant {""}
+        zh_Hant_HK {""}
+        zh_HK {""}
+        zh_Hant_TW {""}
+        zh_TW {""}
     }
 }
diff --git a/stubdata/cfg-large/icudt38l/rbnf/res_index.txt b/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
index ae5ea141..6388eb70 100644
--- a/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
@@ -17,5 +17,7 @@ res_index:table(nofallback) {
         nl {""}
         
         pl {""}
+
+        ja {""}
     }
 }
diff --git a/stubdata/cfg-large/icudt38l/res_index.txt b/stubdata/cfg-large/icudt38l/res_index.txt
index a0152a08..79c92beb 100644
--- a/stubdata/cfg-large/icudt38l/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/res_index.txt
@@ -91,5 +91,8 @@ res_index:table(nofallback) {
         zh {""}
         zh_CN {""}
         zh_TW {""}
+
+        ja {""}
+        ja_JP {""}
     }
 }
diff --git a/stubdata/cfg-zh/icudt38l.txt b/stubdata/cfg-zh/icudt38l.txt
new file mode 100644
index 00000000..09c09037
--- /dev/null
+++ b/stubdata/cfg-zh/icudt38l.txt
@@ -0,0 +1,205 @@
+brkitr/char.brk
+brkitr/en.res
+brkitr/en_US.res
+brkitr/en_US_POSIX.res
+brkitr/line.brk
+brkitr/res_index.res
+brkitr/root.res
+brkitr/sent.brk
+brkitr/title.brk
+brkitr/word.brk
+brkitr/word_POSIX.brk
+
+coll/cs.res
+coll/cs_CZ.res
+coll/de.res
+coll/de_.res
+coll/de_AT.res
+coll/de_BE.res
+coll/de_CH.res
+coll/de_DE.res
+coll/de_LU.res
+coll/de__PHONEBOOK.res
+coll/en.res
+coll/en_AU.res
+coll/en_BE.res
+coll/en_BW.res
+coll/en_CA.res
+coll/en_GB.res
+coll/en_HK.res
+coll/en_IE.res
+coll/en_IN.res
+coll/en_MT.res
+coll/en_NZ.res
+coll/en_PH.res
+coll/en_SG.res
+coll/en_US.res
+coll/en_US_POSIX.res
+coll/en_VI.res
+coll/en_ZA.res
+coll/en_ZW.res
+coll/es.res
+coll/es_US.res
+coll/fr.res
+coll/fr_FR.res
+coll/it.res
+coll/it_CH.res
+coll/it_IT.res
+coll/nl.res
+coll/nl_BE.res
+coll/nl_NL.res
+coll/pl.res
+coll/pl_PL.res
+coll/zh.res
+coll/zh_Hans.res
+coll/zh_Hant.res
+coll/zh_CN.res
+coll/zh_Hans_CN.res
+coll/zh_TW.res
+coll/zh_Hant_TW.res
+coll/zh_HK.res
+coll/zh_Hant_HK.res
+coll/res_index.res
+coll/root.res
+
+rbnf/de.res
+rbnf/en.res
+rbnf/en_GB.res
+rbnf/es.res
+rbnf/fr.res
+rbnf/it.res
+rbnf/nl.res
+rbnf/pl.res
+rbnf/res_index.res
+rbnf/root.res
+
+ar.res
+cs.res
+cs_CZ.res
+da.res
+da_DK.res
+de.res
+de_AT.res
+de_BE.res
+de_CH.res
+de_DE.res
+de_LI.res
+de_LU.res
+el.res
+el_GR.res
+en.res
+en_AU.res
+en_BE.res
+en_BW.res
+en_BZ.res
+en_CA.res
+en_GB.res
+en_HK.res
+en_IE.res
+en_IN.res
+en_JM.res
+en_MH.res
+en_MT.res
+en_NA.res
+en_NZ.res
+en_PH.res
+en_PK.res
+en_SG.res
+en_TT.res
+en_US.res
+en_US_POSIX.res
+en_VI.res
+en_ZA.res
+en_ZW.res
+es.res
+es_ES.res
+es_US.res
+fi.res
+fr.res
+fr_BE.res
+fr_CA.res
+fr_CH.res
+fr_FR.res
+fr_LU.res
+fr_MC.res
+he.res
+hr.res
+hu.res
+id.res
+it.res
+it_CH.res
+it_IT.res
+ko.res
+ko_KR.res
+nb.res
+nb_NO.res
+nl.res
+nl_BE.res
+nl_NL.res
+pl.res
+pl_PL.res
+pt.res
+pt_BR.res
+pt_PT.res
+ro.res
+ru.res
+ru_RU.res
+sk.res
+sr.res
+sv.res
+sv_SE.res
+th.res
+tr.res
+tr_TR.res
+uk.res
+zh.res
+zh_CN.res
+zh_Hans.res
+zh_Hans_CN.res
+zh_Hant.res
+zh_Hant_TW.res
+zh_TW.res
+
+gsm-03.38-2000.cnv
+ibm-1089_P100-1995.cnv
+ibm-1383_P110-1999.cnv
+ibm-5012_P100-1999.cnv
+ibm-5346_P100-1998.cnv
+ibm-5347_P100-1998.cnv
+ibm-5348_P100-1997.cnv
+ibm-5349_P100-1998.cnv
+ibm-5350_P100-1998.cnv
+ibm-5354_P100-1998.cnv
+ibm-864_X110-1999.cnv
+ibm-878_P100-1996.cnv
+ibm-9005_X110-2007.cnv
+ibm-912_P100-1995.cnv
+ibm-913_P100-2000.cnv
+ibm-914_P100-1995.cnv
+ibm-915_P100-1995.cnv
+ibm-920_P100-1995.cnv
+ibm-921_P100-1995.cnv
+ibm-923_P100-1998.cnv
+ibm-943_P15A-2003.cnv
+ibm-9447_P100-2002.cnv
+ibm-9448_X100-2005.cnv
+ibm-9449_P100-2002.cnv
+ibm-954_P101-2007.cnv
+iso-8859_10-1998.cnv
+iso-8859_11-2001.cnv
+iso-8859_14-1998.cnv
+iso-8859_16-2001.cnv
+macos-0_2-10.2.cnv
+windows-874-2000.cnv
+windows-936-2000.cnv
+windows-949-2000.cnv
+windows-950-2000.cnv
+
+cnvalias.icu
+invuca.icu
+pnames.icu
+res_index.res
+root.res
+supplementalData.res
+ucadata.icu
+zoneinfo.res
diff --git a/stubdata/cfg-zh/icudt38l/brkitr/res_index.txt b/stubdata/cfg-zh/icudt38l/brkitr/res_index.txt
new file mode 100644
index 00000000..8f775925
--- /dev/null
+++ b/stubdata/cfg-zh/icudt38l/brkitr/res_index.txt
@@ -0,0 +1,8 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+    InstalledLocales {
+        en {""}
+        en_US {""}
+        en_US_POSIX {""}
+    }
+}
diff --git a/stubdata/cfg-zh/icudt38l/coll/res_index.txt b/stubdata/cfg-zh/icudt38l/coll/res_index.txt
new file mode 100644
index 00000000..daea166f
--- /dev/null
+++ b/stubdata/cfg-zh/icudt38l/coll/res_index.txt
@@ -0,0 +1,66 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+    InstalledLocales {
+        cs {""}
+        cs_CZ {""}
+
+        de {""}
+        de__PHONEBOOK {""}
+        de_AT {""}
+        de_BE {""}
+        de_CH {""}
+        de_DE {""}
+        de_LU {""}
+
+        en {""}
+        en_AU {""}
+        en_BE {""}
+        en_BW {""}
+        en_CA {""}
+        en_GB {""}
+        en_HK {""}
+        en_IE {""}
+        en_IN {""}
+        en_MT {""}
+        en_NZ {""}
+        en_PH {""}
+        en_SG {""}
+        en_US {""}
+        en_US_POSIX {""}
+        en_VI {""}
+        en_ZA {""}
+        en_ZW {""}
+
+        es {""}
+        es_ES {""}
+        es_US {""}
+
+        fr {""}
+        fr_BE {""}
+        fr_CA {""}
+        fr_CH {""}
+        fr_FR {""}
+        fr_LU {""}
+
+        it {""}
+        it_CH {""}
+        it_IT {""}
+
+        nl {""}
+        nl_BE {""}
+        nl_NL {""}
+
+        pl {""}
+        pl_PL {""}
+
+        zh {""}
+        zh_Hans {""}
+        zh_Hans_CN {""}
+        zh_CN {""}
+        zh_Hant {""}
+        zh_Hant_HK {""}
+        zh_HK {""}
+        zh_Hant_TW {""}
+        zh_TW {""}
+    }
+}
diff --git a/stubdata/cfg-zh/icudt38l/rbnf/res_index.txt b/stubdata/cfg-zh/icudt38l/rbnf/res_index.txt
new file mode 100644
index 00000000..d86c430c
--- /dev/null
+++ b/stubdata/cfg-zh/icudt38l/rbnf/res_index.txt
@@ -0,0 +1,21 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+    InstalledLocales {
+        de {""}
+
+        en {""}
+        en_GB {""}
+
+        es {""}
+
+        fr {""}
+        fr_BE {""}
+        fr_CH {""}
+
+        it {""}
+
+        nl {""}
+
+        pl {""}
+    }
+}
diff --git a/stubdata/cfg-zh/icudt38l/res_index.txt b/stubdata/cfg-zh/icudt38l/res_index.txt
new file mode 100644
index 00000000..641391da
--- /dev/null
+++ b/stubdata/cfg-zh/icudt38l/res_index.txt
@@ -0,0 +1,95 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+    CLDRVersion { "1.5" }
+    InstalledLocales {
+        ar {""}
+        cs {""}
+        cs_CZ {""}
+
+        da {""}
+        da_DK {""}
+        de {""}
+        de_AT {""}
+        de_BE {""}
+        de_CH {""}
+        de_DE {""}
+        de_LI {""}
+        de_LU {""}
+
+        el {""}
+        el_GR {""}
+        en {""}
+        en_AU {""}
+        en_BE {""}
+        en_BW {""}
+        en_BZ {""}
+        en_CA {""}
+        en_GB {""}
+        en_HK {""}
+        en_IE {""}
+        en_IN {""}
+        en_JM {""}
+        en_MH {""}
+        en_MT {""}
+        en_NA {""}
+        en_NZ {""}
+        en_PH {""}
+        en_PK {""}
+        en_SG {""}
+        en_TT {""}
+        en_US {""}
+        en_US_POSIX {""}
+        en_VI {""}
+        en_ZA {""}
+        en_ZW {""}
+
+        es {""}
+        es_ES {""}
+        es_US {""}
+
+        fi {""}
+        fr {""}
+        fr_BE {""}
+        fr_CA {""}
+        fr_CH {""}
+        fr_FR {""}
+        fr_LU {""}
+
+        fr_MC {""}
+        he {""}
+        hr {""}
+        hu {""}
+        id {""}
+        it {""}
+        it_CH {""}
+        it_IT {""}
+
+        ko {""}
+        ko_KR {""}
+        nb {""}
+        nb_NO {""}
+        nl {""}
+        nl_BE {""}
+        nl_NL {""}
+
+        pl {""}
+        pl_PL {""}
+        pt {""}
+        pt_BR {""}
+        pt_PT {""}
+        ro {""}
+        ru {""}
+        ru_RU {""}
+        sk {""}
+        sr {""}
+        sv {""}
+        sv_SE {""}
+        th {""}
+        tr {""}
+        tr_TR {""}
+        uk {""}
+        zh {""}
+        zh_CN {""}
+        zh_TW {""}
+    }
+}
diff --git a/stubdata/icudt38l-large.dat b/stubdata/icudt38l-large.dat
index 9249bbf8..50f0b378 100644
--- a/stubdata/icudt38l-large.dat
+++ b/stubdata/icudt38l-large.dat
diff --git a/stubdata/icudt38l-zh.dat b/stubdata/icudt38l-zh.dat
new file mode 100644
index 00000000..99d9d1e9
--- /dev/null
+++ b/stubdata/icudt38l-zh.dat