commit d2dfb8d32fcdad9b39c72c0a9ed13b0a098e24ca
author The Android Automerger <android-build@google.com> Wed Aug 12 01:05:38 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Aug 12 01:05:38 2015 -0700
tree 7bac0e9f01ff631cd3d528ba177b0d71c22a5ff6
parent d37af1cf3a97904579b347bafdf63c0c629a54fd
parent 3a223e1dfa53c2705d46373a695c9b5cf1377ac3

merge in mnc-release history after reset to mnc-dev

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 1591866..97c6ea0 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1246,7 +1246,7 @@
             final Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
             final Uri lookupUri = Contacts.getLookupUri(getContentResolver(), contactUri);
             List<String> pathSegments = lookupUri.getPathSegments();
-            uriListBuilder.append(pathSegments.get(pathSegments.size() - 2));
+            uriListBuilder.append(Uri.encode(pathSegments.get(pathSegments.size() - 2)));
             firstIteration = false;
         }
         final Uri uri = Uri.withAppendedPath(