am 33bfa9ef: Merge "Fix recycler NPE" into gingerbread
am 33bfa9ef: Merge "Fix recycler NPE" into gingerbread

* commit '33bfa9ef9648ab090c1913a8debac5bb49a84d31':
  Fix recycler NPE

bmaupin/android-sms-plus