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

am: aa4877e295

Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
This commit is contained in:
Tobias Thierer
2017-03-07 16:43:16 +00:00
committed by android-build-merger
3 changed files with 6 additions and 0 deletions

View File

@@ -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";
}

View File

@@ -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";
}

View File

@@ -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";
}