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

Commit ab9211b8 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e2 am: b96d428e 

am: 6779441d

Change-Id: Ib6b611e88dc342d5ce28e5594db142d54b840c20
parents c7eefdbd 6779441d

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -19635,6 +19635,8 @@ package android.icu.util { 
    field public static final int SHORT_COMMONLY_USED = 6; // 0x6

    field public static final int SHORT_GENERIC = 2; // 0x2

    field public static final int SHORT_GMT = 4; // 0x4

    field public static final int TIMEZONE_ICU = 0; // 0x0

    field public static final int TIMEZONE_JDK = 1; // 0x1

    field public static final android.icu.util.TimeZone UNKNOWN_ZONE;

    field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";

  }

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -21074,6 +21074,8 @@ package android.icu.util { 
    field public static final int SHORT_COMMONLY_USED = 6; // 0x6

    field public static final int SHORT_GENERIC = 2; // 0x2

    field public static final int SHORT_GMT = 4; // 0x4

    field public static final int TIMEZONE_ICU = 0; // 0x0

    field public static final int TIMEZONE_JDK = 1; // 0x1

    field public static final android.icu.util.TimeZone UNKNOWN_ZONE;

    field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";

  }

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -19674,6 +19674,8 @@ package android.icu.util { 
    field public static final int SHORT_COMMONLY_USED = 6; // 0x6

    field public static final int SHORT_GENERIC = 2; // 0x2

    field public static final int SHORT_GMT = 4; // 0x4

    field public static final int TIMEZONE_ICU = 0; // 0x0

    field public static final int TIMEZONE_JDK = 1; // 0x1

    field public static final android.icu.util.TimeZone UNKNOWN_ZONE;

    field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";

  }