Merge "Deprecate JapaneseCalendar.CURRENT_ERA" am: 0f5893ee60

am: 7f9c43a01e

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

View File

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