Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e4d7e0 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK" am:... 

Merge "Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK" am: 5d84cbd0 am: f699773f" into qt-dev-plus-aosp
parents 5eca7406 315612d9

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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;

api/removed.txt

+8 −0
Original line number Diff line number Diff line
@@ -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 {