commit 5727eeebd6f7afc15b773dd851a121f51a4ccd75
author Scott Kennedy <skennedy@google.com> Thu Mar 14 13:11:56 2013 -0700
committer Scott Kennedy <skennedy@google.com> Thu Mar 14 13:11:56 2013 -0700
tree ab346b5390fb1f343ef582425d01ad59a0265685
parent 4aa10b1bc14290397756b05e97ff9bc8a3b7564b
parent 35d3af70da9740a81eb8eda5a7f87e6f396fb151

resolved conflicts for merge of 35d3af70 to jb-mr2-dev

Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc

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

diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 67a5ca9..5e433fa 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2347,12 +2347,12 @@
         int originalTokenStart = mTokenizer.findTokenStart(text, getSelectionEnd());
         String lastAddress = text.substring(originalTokenStart);
         int tokenStart = originalTokenStart;
-        int prevTokenStart = tokenStart;
+        int prevTokenStart = 0;
         DrawableRecipientChip findChip = null;
         ArrayList<DrawableRecipientChip> created = new ArrayList<DrawableRecipientChip>();
         if (tokenStart != 0) {
             // There are things before this!
-            while (tokenStart != 0 && findChip == null) {
+            while (tokenStart != 0 && findChip == null && tokenStart != prevTokenStart) {
                 prevTokenStart = tokenStart;
                 tokenStart = mTokenizer.findTokenStart(text, tokenStart);
                 findChip = findChip(tokenStart);