commit 89fbc00602da824a54188d3ce4e71728fe517c10
author vichang <vichang@google.com> Fri May 03 16:15:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 03 16:15:21 2019 -0700
tree 2da0b05a7d936f52cbf775d5a71318b3b0efbe7d
parent da15ab6ad4766cd66f21363c99a72b349cd41b12
parent c0e4d7e02bef5c84a01d41e14016cd29660d4eca

Merge "Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK" am: 5d84cbd007 am: f699773fbd" into qt-dev-plus-aosp
am: c0e4d7e02b

Change-Id: I6aec94740732e425c34d66e3f65cd75f8298b53d

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 6a2e5ce..3145bd2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21807,7 +21807,6 @@
     ctor public JapaneseCalendar(int, int, int, int);
     ctor public JapaneseCalendar(int, int, int);
     ctor public JapaneseCalendar(int, int, int, int, int, int);
-    field @Deprecated public static final int CURRENT_ERA;
     field public static final int HEISEI;
     field public static final int MEIJI;
     field public static final int SHOWA;

api/removed.txt

diff --git a/api/removed.txt b/api/removed.txt
index ab5e7e5..72cb92c 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -280,6 +280,14 @@
 
 }
 
+package android.icu.util {
+
+  public class JapaneseCalendar extends android.icu.util.GregorianCalendar {
+    field public static final int CURRENT_ERA;
+  }
+
+}
+
 package android.location {
 
   public class Location implements android.os.Parcelable {