diff options
| author | 2017-03-07 16:49:38 +0000 | |
|---|---|---|
| committer | 2017-03-07 16:49:38 +0000 | |
| commit | 6779441da0d3d71fe54e94f272b856a53004c452 (patch) | |
| tree | 4fdbbf857296ae4a2034acf6afa9d45aed600a97 | |
| parent | bb54baba0426819d6539aa47c48312440db4fb7e (diff) | |
| parent | b96d428e40ad345e402673c9a98a59a91e48019c (diff) | |
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e295
am: b96d428e40
Change-Id: Ie91a466fa5e774cb5cb64361f00bb29643805cf0
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ba02690abd45..c8009f19094d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; } diff --git a/api/system-current.txt b/api/system-current.txt index fc37ce9ec64a..fe339735b5c1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; } diff --git a/api/test-current.txt b/api/test-current.txt index aa61f94e70b6..0ad96472f15f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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"; } |