Merge commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6' into eclair-mr2-plus-aosp * commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6': Avoid NPE when callers send null selection args.
Merge commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6' into eclair-mr2-plus-aosp * commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6': Avoid NPE when callers send null selection args.