Merge "Deprecate JapaneseCalendar.CURRENT_ERA"

am: 0f5893ee60

Change-Id: I29548ec04dd5a37d5a672430002b380ff56667d9
This commit is contained in:
vichang
2019-01-22 03:19:03 -08:00
committed by android-build-merger

View File

@@ -20918,7 +20918,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;