diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-09-13 13:07:59 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2014-09-13 20:10:08 +0000 |
| commit | 6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025 (patch) | |
| tree | 2e63c5fe96fe193e990e350cae312e7d78c1e295 /core/java/android/provider | |
| parent | 42e34dea5d20db85f7a002623397eb1b11cc46e1 (diff) | |
| parent | ead6ad8a383d945a4c625cb537372c8ee65f6ab4 (diff) | |
| download | frameworks_base-6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025.zip frameworks_base-6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025.tar.gz frameworks_base-6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025.tar.bz2 | |
resolved conflicts for merge of 66c16547 to lmp-sprout-dev
Also fixed issue in TelephonyManager.
Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/CallLog.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index 26228fb..3e80ed0 100644 --- 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; |