Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp * commit '2f77ffb087892f9474b35cb019f593025653e492': Don't crash if the cursor is null.
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp * commit '2f77ffb087892f9474b35cb019f593025653e492': Don't crash if the cursor is null.