commit 47f4077e34069cc6c254a6141e56e13b4a814879
author Scott Kennedy <skennedy@google.com> Thu Aug 01 11:10:41 2013 -0700
committer Scott Kennedy <skennedy@google.com> Thu Aug 01 11:10:41 2013 -0700
tree f63569d58f4ed2c68688248d8da0773f7f0ebda9
parent b2b33afc99c01808b500b1443ea5802eaa493ad5
parent c430ea869c6d2e969cf8471875c951d201088610

resolved conflicts for merge of b6c18ed6 to master

Change-Id: I7617af351d1fa7e4ce9ff401beffe21690b429d3

src/com/android/ex/chips/RecipientEditTextView.java

diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index 9721ed6..9fe4ab1 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2493,10 +2493,6 @@
                 }
             }
             final BaseRecipientAdapter adapter = (BaseRecipientAdapter) getAdapter();
-            if (adapter == null) {
-                Log.wtf(TAG, "My assumption that this was fixed is wrong.");
-                return null;
-            }
             RecipientAlternatesAdapter.getMatchingRecipients(getContext(), adapter, addresses,
                     adapter.getAccount(), new RecipientMatchCallback() {
                         @Override