diff options
author | Evan Charlton <evanc@google.com> | 2014-05-14 11:53:28 -0700 |
---|---|---|
committer | Evan Charlton <evanc@google.com> | 2014-05-14 11:53:28 -0700 |
commit | 6f7c74242a050c8545f5d3e92d968cf167f604e4 (patch) | |
tree | 1f2ed1582b891c56a3b2196c84826b58ed896e7f /InCallUI | |
parent | c62d1e6ad2d912a6913139505ca70ffef3355bc0 (diff) | |
parent | f965ebbdfddf7070ab1807a49b203e76e58b7e4e (diff) |
resolved conflicts for merge of 9d031ca4 to master
Change-Id: I122b53beb517cddd72214b15cf14f5e2083066fd
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 2 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 80b80aa72..277d80211 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -21,10 +21,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.graphics.Bitmap; -import android.telephony.DisconnectCause; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.telecomm.InCallAdapter; +import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.text.format.DateUtils; diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 2180aeae0..f4af51280 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -28,8 +28,8 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; -import android.telephony.DisconnectCause; import android.telecomm.InCallAdapter; +import android.telephony.DisconnectCause; import android.view.KeyEvent; import android.view.View; import android.view.Window; |