merge in klp-release history after reset to klp-dev
diff --git a/src/com/android/contacts/model/ContactLoader.java b/src/com/android/contacts/model/ContactLoader.java
index 28b1e5a..7ca1329 100644
--- a/src/com/android/contacts/model/ContactLoader.java
+++ b/src/com/android/contacts/model/ContactLoader.java
@@ -353,7 +353,7 @@
     }
 
     private Contact loadEncodedContactEntity(Uri uri) throws JSONException {
-        final String jsonString = uri.getQueryParameter(Constants.LOOKUP_URI_JSON);
+        final String jsonString = uri.getEncodedFragment();
         final JSONObject json = new JSONObject(jsonString);
 
         final long directoryId =