commit 0325193651b309b015b5d1ad40fff7a70c77c778
author The Android Automerger <android-build@android.com> Fri Oct 12 10:27:11 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Oct 12 10:27:11 2012 -0700
tree 2df133e5b5cd33c8a0f5388516d9a273a1fce219
parent 2a1209a5a72e03643d46eff134920ac5a5fbc17d
parent 92fb55d273ddee5adcc23bbc1c1fee4429849b3a

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java

diff --git a/exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
index 6d725ff..5843c46 100644
--- a/exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
+++ b/exchange2/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
@@ -330,8 +330,8 @@
                         displayName, displayName, Phone.TYPE_WORK, ps.get(GalData.WORK_PHONE));
                 GalContactRow.addPhoneRow(cursor, galProjection, contactId, accountName,
                         displayName, displayName, Phone.TYPE_MOBILE, ps.get(GalData.MOBILE_PHONE));
-                GalContactRow.addNameRow(cursor, galProjection, contactId, accountName, displayName,
-                        ps.get(GalData.FIRST_NAME), ps.get(GalData.LAST_NAME), displayName);
+                GalContactRow.addNameRow(cursor, galProjection, contactId, displayName, accountName,
+                        displayName, ps.get(GalData.FIRST_NAME), ps.get(GalData.LAST_NAME));
                 return cursor;
             }
         }