Merge "Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK" am: 5d84cbd007 am: f699773fbd" into qt-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
c0e4d7e02b
@@ -21807,7 +21807,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;
|
||||
|
||||
@@ -280,6 +280,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 {
|
||||
|
||||
Reference in New Issue
Block a user