am 8772c2df: am 9f752ed5: Renaming Presence and Presence-related columns.
am 8772c2df: am 9f752ed5: Renaming Presence and Presence-related columns.

Merge commit '8772c2df3893fadf3e129777ce44ec129abaaece'

* commit '8772c2df3893fadf3e129777ce44ec129abaaece':
  Renaming Presence and Presence-related columns.

bmaupin/android-sms-plus