diff options
| author | Filip Pavlis <pavlis@google.com> | 2018-03-29 15:12:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-29 15:12:01 +0000 |
| commit | f030dd503f8432c0d5d1bb1fb516f032d30b94f1 (patch) | |
| tree | 9d8d14a95523d2af62a9ed2e04b7f3f438bd833b | |
| parent | 82634f4ba67bdd62bfd0dc6d2e2dab63608971cf (diff) | |
| parent | 1bc4d5cf4141663466521800e7c43e790eb33e59 (diff) | |
| download | TimeZoneData-f030dd503f8432c0d5d1bb1fb516f032d30b94f1.tar.gz | |
Move TimeZoneData to androidx.
am: 1bc4d5cf41
Change-Id: I639cc03a097c8c07ac9023c3c8f4f473b8ac806c
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ LOCAL_MODULE := time_zone_distro_provider LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src/main) LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/proguard.cfg -LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro_unbundled android-support-annotations +LOCAL_STATIC_JAVA_LIBRARIES := time_zone_distro_unbundled androidx.annotation_annotation LOCAL_SDK_VERSION := system_current include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java b/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java index d92665a..0c1b39c 100644 --- a/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java +++ b/src/main/com/android/timezone/data/TimeZoneRulesDataProvider.java @@ -34,8 +34,8 @@ import android.os.ParcelFileDescriptor; import android.os.UserHandle; import android.provider.TimeZoneRulesDataContract; import android.provider.TimeZoneRulesDataContract.Operation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.File; import java.io.FileNotFoundException; |