am 72f91d0c: am 06ff7691: Merge "Fix an NullPointerException when finished"
am 72f91d0c: am 06ff7691: Merge "Fix an NullPointerException when finished"

* commit '72f91d0cf3386ab9a263cabfed1675b2d92de909':
  Fix an NullPointerException when finished

bmaupin/android-sms-plus