am 2b3d70c4: am cb0668e2: Fix null ref
am 2b3d70c4: am cb0668e2: Fix null ref

Merge commit '2b3d70c4e6d7f9678c6666c09b44b995e5b061f2' into eclair-mr2-plus-aosp

* commit '2b3d70c4e6d7f9678c6666c09b44b995e5b061f2':
  Fix null ref

bmaupin/android-sms-plus