diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
| commit | a0dcdf5c762ff28edeea34c2cfe654c31889abc7 (patch) | |
| tree | 9e92fc9f9f0bc44c2593c00e29290ad8f392747e /src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
| parent | 6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (diff) | |
| parent | 9efc13983516c4c37540eb9544f8fa411ded81c7 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 10fb7a59..57951874 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -7,7 +7,7 @@ import android.graphics.Typeface; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.util.Log; +import de.thedevstack.conversationsplus.utils.Logging; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; |