diff options
| author | Julian Kast <julian@livio.com> | 2020-08-11 11:14:57 -0400 |
|---|---|---|
| committer | Julian Kast <julian@livio.com> | 2020-08-11 11:14:57 -0400 |
| commit | 47f8e30637323682593a57fd935f172e8e765593 (patch) | |
| tree | f5b0ac9ed9d13c2ffe332b3e92dedf0d47757229 /android/sdl_android/src | |
| parent | 8926e73e37fe85e3aeb99896f5adb68f3d94b5a7 (diff) | |
| download | sdl_android-47f8e30637323682593a57fd935f172e8e765593.tar.gz | |
Fix sdlProxyBase Merge conflict
Diffstat (limited to 'android/sdl_android/src')
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index 6277bb57d..daf203b5f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -40,7 +40,7 @@ import android.os.Build; import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
import android.util.SparseArray;
|