am 4f485ea3: bug 2169583: fix a thread mixup problem caused by empty draft message having an unaccounted for thread id.
am 4f485ea3: bug 2169583: fix a thread mixup problem caused by empty draft message having an unaccounted for thread id.

Merge commit '4f485ea3aabce679b3d749ba843fee5134ebf118' into eclair-plus-aosp

* commit '4f485ea3aabce679b3d749ba843fee5134ebf118':
  bug 2169583: fix a thread mixup problem caused by empty draft message having an unaccounted for thread id.

bmaupin/android-sms-plus