commit f699773fbd26b439642d753a9a68e7ed62a2c7c0
author vichang <vichang@google.com> Fri May 03 10:31:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 03 10:31:30 2019 -0700
tree 77b26cd14bf6ce39fe56c4437e9449dfdb8e3a5f
parent 3d94f0ea5b982c927552ddf9340b81781c63633a
parent 5d84cbd007fa1d9da9ba2319af2841576c6dc390

Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"
am: 5d84cbd007

Change-Id: I671d25b15283a252489286dbb0a9105332d97ce7

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index cf455c2..9fd157f 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -20930,7 +20930,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 72202ad..f40b146 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -275,6 +275,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 {