Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"

am: 5d84cbd007

Change-Id: I671d25b15283a252489286dbb0a9105332d97ce7
This commit is contained in:
vichang
2019-05-03 10:31:30 -07:00
committed by android-build-merger
2 changed files with 8 additions and 1 deletions

View File

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

View File

@@ -275,6 +275,14 @@ package android.hardware {
}
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 {