summaryrefslogtreecommitdiffstats
path: root/src/com/android/services/telephony/CdmaConference.java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-09-12 22:17:53 -0700
committerTyler Gunn <tgunn@google.com>2014-09-12 22:17:53 -0700
commit4d45d1cf58a2003378fd35912d6d73a00001bf06 (patch)
treea6d3f0d030495c5294532b03d93e067000816234 /src/com/android/services/telephony/CdmaConference.java
parent6058a60b497de4e48451e1f84721070b796052d4 (diff)
downloadandroid_packages_services_Telephony-4d45d1cf58a2003378fd35912d6d73a00001bf06.tar.gz
android_packages_services_Telephony-4d45d1cf58a2003378fd35912d6d73a00001bf06.tar.bz2
android_packages_services_Telephony-4d45d1cf58a2003378fd35912d6d73a00001bf06.zip
Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom - Changing package from com.android.telecomm to com.android.server.telecomm. - Renaming TelecommManager to TelecomManager. Bug: 17364651 Change-Id: Ic33bafd37200e65431543a9889aed549dbb04831
Diffstat (limited to 'src/com/android/services/telephony/CdmaConference.java')
-rw-r--r--src/com/android/services/telephony/CdmaConference.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/services/telephony/CdmaConference.java b/src/com/android/services/telephony/CdmaConference.java
index 90f856610..0ede5d558 100644
--- a/src/com/android/services/telephony/CdmaConference.java
+++ b/src/com/android/services/telephony/CdmaConference.java
@@ -16,10 +16,10 @@
package com.android.services.telephony;
-import android.telecomm.Conference;
-import android.telecomm.Connection;
-import android.telecomm.PhoneAccountHandle;
-import android.telecomm.PhoneCapabilities;
+import android.telecom.Conference;
+import android.telecom.Connection;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.PhoneCapabilities;
import com.android.internal.telephony.Call;
import com.android.internal.telephony.CallStateException;