commit 72d6ea869825c09f1702758221847ac8a9e668d1
author Fredrik Roubert <roubert@google.com> Wed Apr 12 23:14:41 2017 +0200
committer Fredrik Roubert <roubert@google.com> Thu Apr 13 13:19:52 2017 +0200
tree b1581506a35267225aac7c2cffb3c37774fd33a3
parent 40e0c8d615d264a6494bb8eef0288e67231d68d5

Integrate changes made for updated CLDR patches into android_icu4j.

Bug: 37275962
Test: CtsIcuTestCases
Test: CtsLibcoreOjTestCases
Test: CtsLibcoreTestCases
Change-Id: I7abe797e9272618d49173e905e778a9602db26a5

android_icu4j/src/main/tests/android/icu/dev/test/calendar/CalendarRegressionTest.java

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/CalendarRegressionTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/CalendarRegressionTest.java
index eb0fc08c..5d6ce4a 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/CalendarRegressionTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/CalendarRegressionTest.java
@@ -2171,7 +2171,7 @@
             {"en@calendar=islamic",     "gregorian"},
             {"zh_TW",       "gregorian", "roc", "chinese"},
             {"ar_IR",       "gregorian", "persian", "islamic", "islamic-civil", "islamic-tbla"},
-            {"th@rg=SAZZZZ", "islamic-umalqura", "gregorian", "islamic", "islamic-rgsa"},
+            {"th@rg=SAZZZZ", "gregorian", "islamic-umalqura", "islamic", "islamic-rgsa"},
         };
         // Android patch end.
 

android_icu4j/src/main/tests/android/icu/dev/test/calendar/IBMCalendarTest.java

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IBMCalendarTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IBMCalendarTest.java
index 7894088..5e243c5 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IBMCalendarTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/IBMCalendarTest.java
@@ -1119,8 +1119,8 @@
                 "gregorian",
                 "gregorian",    // iso8601 is a gregorian sub type
                 "gregorian",
-                "islamic-umalqura",
-                "islamic-umalqura",
+                "gregorian",
+                "gregorian",
                 "japanese",
                 "gregorian",
                 "gregorian",