commit 7f738b1a1861a485135650886a3a7059f794773f
author Yorke Lee <yorkelee@google.com> Thu Oct 10 15:50:23 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 10 15:50:23 2013 -0700
tree 1181468749848c40565dbb6342341652cf8347d9
parent 4858c5256bed798f5a8492b78fcd8eca02a610c4
parent 3e073f3d65109ba16f73d6987c68eb3e059ebb2a

am 3e073f3d: Correctly pass photo data to contact editor

* commit '3e073f3d65109ba16f73d6987c68eb3e059ebb2a':
  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,