commit 7e9623bba4d2e867eed2b7296afc782d9da5d7ae
author Yorke Lee <yorkelee@google.com> Thu Oct 10 16:12:39 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 10 16:12:39 2013 -0700
tree e7ee888136bc3d746829e284b345016d015c3564
parent feeec40052a5956764fdd23844274d9b76515d23
parent 8a8fadf744a672f8bcdd4636260487e91b7f75f3

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

* commit '8a8fadf744a672f8bcdd4636260487e91b7f75f3':
  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,