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

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

Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 

am: aa4877e2

Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
parents 0f901af9 aa4877e2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -18725,6 +18725,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
@@ -19939,6 +19939,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
@@ -18743,6 +18743,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";

  }