Merge "Deprecate JapaneseCalendar.CURRENT_ERA" am: 0f5893ee60 am: 7f9c43a01e

am: d4a58e4a9a

Change-Id: Ia07beec9ff556378d72fe94881d5ff579e400cbf
This commit is contained in:
vichang
2019-01-22 04:13:20 -08:00
committed by android-build-merger

View File

@@ -21650,7 +21650,7 @@ package android.icu.util {
ctor public JapaneseCalendar(int, int, int, int);
ctor public JapaneseCalendar(int, int, int);
ctor public JapaneseCalendar(int, int, int, int, int, int);
field public static final int CURRENT_ERA;
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;