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

Commit d4a58e4a authored by vichang's avatar vichang Committed by android-build-merger
Browse files

Merge "Deprecate JapaneseCalendar.CURRENT_ERA" am: 0f5893ee 

am: 7f9c43a0

Change-Id: Idb56be376c9b9e14f587ac3078d9356ca661c708
parents 4293455f 7f9c43a0

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -20916,7 +20916,7 @@ package android.icu.util { 
    ctor public JapaneseCalendar(int, int, int, int);

    ctor public JapaneseCalendar(int, int, int, int);

    ctor public JapaneseCalendar(int, int, int);

    ctor public JapaneseCalendar(int, int, int);

    ctor public JapaneseCalendar(int, int, int, 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 HEISEI;

    field public static final int MEIJI;

    field public static final int MEIJI;

    field public static final int SHOWA;

    field public static final int SHOWA;