am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2
am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2

Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5'

* commit '34cc52922d4268633b3730dfd73658be6a06a2c5':
  Check cursor and URI value for nullity to prevent NPE.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base