am 82103d23: Merge change Iddaa2885 into eclair

Merge commit '82103d230a79eca84ba4357962b2a4e4eccaee7d' into eclair-plus-aosp

* commit '82103d230a79eca84ba4357962b2a4e4eccaee7d':
  b/2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.

diff --git a/src/com/android/calendar/EmailAddressAdapter.java b/src/com/android/calendar/EmailAddressAdapter.java
index 4679960..bfcb986 100644 (file)
--- a/src/com/android/calendar/EmailAddressAdapter.java
+++ b/src/com/android/calendar/EmailAddressAdapter.java
@@ -59,7 +59,7 @@ public class EmailAddressAdapter extends ResourceCursorAdapter {
         String name = cursor.getString(NAME_INDEX);
         String address = cursor.getString(DATA_INDEX);
 
-        return new Rfc822Token(address, name, null).toString();
+        return new Rfc822Token(name, address, null).toString();
     }
 
     @Override