commit d893f9933a42eab152cf50a5eb7b00c4af34d521
author Aurimas Liutikas <aurimas@google.com> Tue Feb 19 12:17:13 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 19 12:17:13 2019 -0800
tree a78de485f00ce028f95887a8d7f6190c84b6111a
parent 1254616910bb4880188dfae0fc8f14c8556f934d
parent 9f477e745ed2bb8fde47942510cb3b3efb733bf5

Merge "Convert Calendar to androidx" am: 284cf496ed
am: 9f477e745e

Change-Id: Ie89dc6d93e56e9e432c23647871b11ba2918e319

Android.mk

diff --git a/Android.mk b/Android.mk
index 5c510f3..4b5744a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,7 @@
         colorpicker \
         android-opt-datetimepicker \
         android-opt-timezonepicker \
-        android-support-v4 \
+        androidx.legacy_legacy-support-v4 \
         calendar-common
 
 LOCAL_SDK_VERSION := current

src/com/android/calendar/alerts/DismissAlarmsService.java

diff --git a/src/com/android/calendar/alerts/DismissAlarmsService.java b/src/com/android/calendar/alerts/DismissAlarmsService.java
index 931f99f..1ec3c22 100644
--- a/src/com/android/calendar/alerts/DismissAlarmsService.java
+++ b/src/com/android/calendar/alerts/DismissAlarmsService.java
@@ -25,7 +25,7 @@
 import android.net.Uri;
 import android.os.IBinder;
 import android.provider.CalendarContract.CalendarAlerts;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
 
 import android.util.Log;
 import com.android.calendar.EventInfoActivity;