am 0b9a41e3: am e3cc2856: Fix null ref
am 0b9a41e3: am e3cc2856: Fix null ref

Merge commit '0b9a41e3f65db1c51ff929e6fffb9c9ae3e9d34d' into eclair-mr2-plus-aosp

* commit '0b9a41e3f65db1c51ff929e6fffb9c9ae3e9d34d':
  Fix null ref

bmaupin/android-sms-plus