commit 4edaaa98d71ed588de62a62410f342ab913a854d
author Elliott Hughes <enh@google.com> Thu Dec 26 18:32:08 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 26 18:32:08 2013 +0000
tree e0cd8c595ddbe23d8bbef1bb3dc6ebcfbc14a3bd
parent 75e18f0c2c5278242f158003f440634df70ddd8e
parent b844b3e14e24df5b8d9b25539f6eb92ac507d8b4

Merge "Force icu4c to always default to the Gregorian calendar."

data/locales/fa.txt

diff --git a/data/locales/fa.txt b/data/locales/fa.txt
index feedef7..06e6e2e 100644
--- a/data/locales/fa.txt
+++ b/data/locales/fa.txt
@@ -143,7 +143,7 @@
     }
     Version{"2.0.82.45"}
     calendar{
-        default{"persian"}
+        default{"gregorian"} // android-changed
         generic{
             DateTimePatterns{
                 "H:mm:ss (zzzz)",

data/locales/ps.txt

diff --git a/data/locales/ps.txt b/data/locales/ps.txt
index 8a4cf71..e6b918d 100644
--- a/data/locales/ps.txt
+++ b/data/locales/ps.txt
@@ -45,7 +45,7 @@
     }
     Version{"2.0.82.45"}
     calendar{
-        default{"persian"}
+        default{"gregorian"} // android-changed
         generic{
             DateTimePatterns{
                 "H:mm:ss (zzzz)",

data/locales/th.txt

diff --git a/data/locales/th.txt b/data/locales/th.txt
index 50cd495..79b9e31 100644
--- a/data/locales/th.txt
+++ b/data/locales/th.txt
@@ -594,7 +594,7 @@
                 }
             }
         }
-        default{"buddhist"}
+        default{"gregorian"} // android-changed
         ethiopic{
             monthNames{
                 format{

data/misc/supplementalData.txt

diff --git a/data/misc/supplementalData.txt b/data/misc/supplementalData.txt
index 513f195..2415792 100644
--- a/data/misc/supplementalData.txt
+++ b/data/misc/supplementalData.txt
@@ -17,8 +17,10 @@
             "islamic-civil",
         }
         AF{
-            "persian",
+// BEGIN android-changed
             "gregorian",
+            "persian",
+// END android-changed
             "islamic",
             "islamic-civil",
         }
@@ -85,8 +87,10 @@
             "islamic-civil",
         }
         IR{
-            "persian",
+// BEGIN android-changed
             "gregorian",
+            "persian",
+// END android-changed
             "islamic",
             "islamic-civil",
         }
@@ -177,8 +181,10 @@
             "islamic-civil",
         }
         TH{
-            "buddhist",
+// BEGIN android-changed
             "gregorian",
+            "buddhist",
+// END android-changed
         }
         TN{
             "gregorian",

stubdata/icudt51l.dat

diff --git a/stubdata/icudt51l.dat b/stubdata/icudt51l.dat
index 638725c..f72b4a3 100644
--- a/stubdata/icudt51l.dat
+++ b/stubdata/icudt51l.dat
Binary files differ