commit adb90684b5cac8d0cd6539b3eeec23ebb7a51bfa
author Daniel Bright <dbright@google.com> Thu Jan 02 19:06:52 2020 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 02 19:06:52 2020 -0800
tree 29db6a98ac2073381a677a70dc04657317b3f857
parent 21bca5cdcb45baca82b5399af59256a4d7a394a3
parent 1945137f47a51d6554fa5b292c4701bab56b498b

Merge "Moved RilRadioTechnology annotation"
am: 1945137f47

Change-Id: Ib0a4766d56ce755015ce528d904c6359a17edf8f

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index fb865b4..14f0cb8 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -37,12 +37,12 @@
 import android.telecom.StatusHints;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
-import android.telephony.Annotation.RilRadioTechnology;
 import android.telephony.CarrierConfigManager;
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.Rlog;
 import android.telephony.ServiceState;
+import android.telephony.ServiceState.RilRadioTechnology;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsCallProfile;