commit aa4877e2953ead5f72947567c810c4031c808e2b
author Tobias Thierer <tobiast@google.com> Tue Mar 07 16:35:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 07 16:35:17 2017 +0000
tree 92f4a9a2548479958a89d1f5388294868590f569
parent 75dfc5bd910ab5904b0364eacce5ece83ea2c828
parent a6a2f5a1749c501eb645c70d25dd71fc24189e12

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index ba02690..c8009f1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18725,6 +18725,8 @@
     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

diff --git a/api/system-current.txt b/api/system-current.txt
index fc37ce9..fe33973 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19939,6 +19939,8 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index b52c2bb..548c14d 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -18742,6 +18742,8 @@
     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";
   }