commit 8a8fadf744a672f8bcdd4636260487e91b7f75f3
author Yorke Lee <yorkelee@google.com> Thu Oct 10 16:05:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 10 16:05:42 2013 -0700
tree 7248f1ff4a8841b929830bdcb26935ad27d3548f
parent a69605eeb770ef990623782806e87a9eb7bcd63f
parent 7f738b1a1861a485135650886a3a7059f794773f

am 7f738b1a: am 3e073f3d: Correctly pass photo data to contact editor

* commit '7f738b1a1861a485135650886a3a7059f794773f':
  Correctly pass photo data to contact editor

src/com/android/contacts/model/ContactLoader.java

diff --git a/src/com/android/contacts/model/ContactLoader.java b/src/com/android/contacts/model/ContactLoader.java
index 7ca1329..e10fc6c 100644
--- a/src/com/android/contacts/model/ContactLoader.java
+++ b/src/com/android/contacts/model/ContactLoader.java
@@ -372,7 +372,7 @@
                 -1 /* id */,
                 -1 /* nameRawContactId */,
                 displayNameSource,
-                -1 /* photoId */,
+                0 /* photoId */,
                 photoUri,
                 displayName,
                 altDisplayName,