commit fee127be2fbfa589d347e9d5a2253a3d2481e2d2
author android-build-team Robot <android-build-team-robot@google.com> Mon Nov 11 21:32:47 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Nov 11 21:32:47 2019 +0000
tree 9079a288bbabdacb8c0e7e61ec5f4b55475ab6f5
parent 80d3c2c798b7989544305c10ddc0f18e61b4ed82
parent e10de6798531b31eb4e348403e06b9b5dc1d9624

Snap for 6001391 from e10de6798531b31eb4e348403e06b9b5dc1d9624 to qt-aml-tzdata-release

Change-Id: Ic57baa33f262af7641254c83cdc48a6921739162

bridge/src/libcore/icu/ICU_Delegate.java

diff --git a/bridge/src/libcore/icu/ICU_Delegate.java b/bridge/src/libcore/icu/ICU_Delegate.java
index 6e82e42..2ba7f92 100644
--- a/bridge/src/libcore/icu/ICU_Delegate.java
+++ b/bridge/src/libcore/icu/ICU_Delegate.java
@@ -16,6 +16,7 @@
 
 package libcore.icu;
 
+import android.icu.util.TimeZone;
 import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
 
 import android.icu.text.DateTimePatternGenerator;
@@ -258,6 +259,6 @@
 
     @LayoutlibDelegate
     /*package*/ static String getTZDataVersion() {
-        return ICU.getTZDataVersion();
+        return TimeZone.getTZDataVersion();
     }
 }