Merge commit '9352b9fb9e0b4023c3bba4349eb9e32dc258b80a' into eclair-plus-aosp * commit '9352b9fb9e0b4023c3bba4349eb9e32dc258b80a': Fix NPE when provider returns null cursor.
Merge commit '9352b9fb9e0b4023c3bba4349eb9e32dc258b80a' into eclair-plus-aosp * commit '9352b9fb9e0b4023c3bba4349eb9e32dc258b80a': Fix NPE when provider returns null cursor.