diff options
| author | vichang <vichang@google.com> | 2020-06-30 17:06:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 17:06:10 +0000 |
| commit | 64937407f2b89913563bdd70aab1d6efcce2b40d (patch) | |
| tree | a43837b3ea0c8c208c59911c044a51587b793df2 /services/java/com/android/server/SystemServer.java | |
| parent | 349777a814ab8ea348d22abd6ffcd92ca709efc0 (diff) | |
| parent | af6f8e2301d8f25f595f98edc0bdba4df24a144b (diff) | |
Merge "Use new package name for ZoneInfo and libcore.timezone" am: af6f8e2301
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346485
Change-Id: I802ef53df4aa0e047d7883f6ee9d0a37f981119b
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 23b1512081da..c48ee11237e9 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -74,6 +74,7 @@ import android.view.WindowManager; import android.view.contentcapture.ContentCaptureManager; import android.view.inputmethod.InputMethodSystemProperty; +import com.android.i18n.timezone.ZoneInfoDb; import com.android.internal.R; import com.android.internal.logging.MetricsLogger; import com.android.internal.notification.SystemNotificationChannels; @@ -165,8 +166,6 @@ import com.android.server.wm.ActivityTaskManagerService; import com.android.server.wm.WindowManagerGlobalLock; import com.android.server.wm.WindowManagerService; -import libcore.timezone.ZoneInfoDb; - import dalvik.system.VMRuntime; import java.io.File; |