am f66e2e24: Merge change 23344 into eclair

Merge commit 'f66e2e249d3a72a8db2817e5969b1f118b07dd69' into eclair-plus-aosp

* commit 'f66e2e249d3a72a8db2817e5969b1f118b07dd69':
  Make vCard composer handle null of Photo entry correctly.

core/java/android/pim/vcard/VCardComposer.java

@@ -967,6 +967,9 @@ public class VCardComposer {
         if (contentValuesList != null) {
             for (ContentValues contentValues : contentValuesList) {
                 byte[] data = contentValues.getAsByteArray(Photo.PHOTO);
+                if (data == null) {
+                    continue;
+                }
                 final String photoType;
                 // Use some heuristics for guessing the format of the image.
                 // TODO: there should be some general API for detecting the file format.