summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-11-26 15:46:42 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-26 15:46:42 -0800
commit894b41c3f85bc2636a35157ed06059f05568e0ea (patch)
tree909959ae75e4ff7b19874219508d75539f0d0e4c /core/java/android
parent5333436303ce9284731905e73a8f41cf179a31a6 (diff)
parent0f2e3d68bee184f062f850e4900c1daffbc428d5 (diff)
Merge "Track move of timezone classes to libcore.timezone" am: bfd3237eac
am: 0f2e3d68be Change-Id: Ia88ee2fae4d3c21f2b7b96513bc4e276df13bc28
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/util/TimeUtils.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java
index 717a85801eba..21c4252a0a7e 100644
--- a/core/java/android/util/TimeUtils.java
+++ b/core/java/android/util/TimeUtils.java
@@ -21,9 +21,9 @@ import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.os.SystemClock;
-import libcore.util.CountryTimeZones;
-import libcore.util.CountryTimeZones.TimeZoneMapping;
-import libcore.util.TimeZoneFinder;
+import libcore.timezone.CountryTimeZones;
+import libcore.timezone.CountryTimeZones.TimeZoneMapping;
+import libcore.timezone.TimeZoneFinder;
import libcore.util.ZoneInfoDB;
import java.io.PrintWriter;