diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-29 14:33:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-29 14:33:04 +0000 |
| commit | fdb676b4dd3c976432a19b5443cfb3ff360c455b (patch) | |
| tree | 395cc13c61a069fb72406b19a2c69254078d248d /core/java/android/util/TimeUtils.java | |
| parent | c872b81243d5bcd6ee6d6873194105dfb45994af (diff) | |
| parent | f8a4287915fb88ff65852c45ae9298d7c1465608 (diff) | |
Merge "Rename ZoneInfoDB -> ZoneInfoDb" am: 402674f2a0 am: c3e31d6ac5 am: f8a4287915
Change-Id: I72978765010e3da52bcdf00299f7ba999bc9201b
Diffstat (limited to 'core/java/android/util/TimeUtils.java')
| -rw-r--r-- | core/java/android/util/TimeUtils.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index 37dd781d4468..c325874405a5 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -26,7 +26,7 @@ import android.os.SystemClock; import libcore.timezone.CountryTimeZones; import libcore.timezone.CountryTimeZones.TimeZoneMapping; import libcore.timezone.TimeZoneFinder; -import libcore.timezone.ZoneInfoDB; +import libcore.timezone.ZoneInfoDb; import java.io.PrintWriter; import java.text.SimpleDateFormat; @@ -134,7 +134,7 @@ public class TimeUtils { * during the lifetime of an activity. */ public static String getTimeZoneDatabaseVersion() { - return ZoneInfoDB.getInstance().getVersion(); + return ZoneInfoDb.getInstance().getVersion(); } /** @hide Field length that can hold 999 days of time */ |