resolved conflicts for merge of 66c16547 to lmp-sprout-dev

[android-x86/frameworks-base.git] / core / java / android / provider / CallLog.java

diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 26228fb..3e80ed0 100644 (file)
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -30,7 +30,7 @@ import android.os.UserManager;
 import android.provider.ContactsContract.CommonDataKinds.Callable;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.DataUsageFeedback;
-import android.telecomm.PhoneAccountHandle;
+import android.telecom.PhoneAccountHandle;
 import android.text.TextUtils;
 
 import com.android.internal.telephony.CallerInfo;