Merge change 25232 into eclair

* changes:
  Fix NPE when provider returns null cursor.

core/java/android/provider/Contacts.java

@@ -542,7 +542,7 @@ public class Contacts {
                 }
                 return new ByteArrayInputStream(data);
             } finally {
-                cursor.close();
+                if (cursor != null) cursor.close();
             }
         }