am bebff625: am 424f5b0b: Merge "Update lists for SMS" into gingerbread

* commit 'bebff625b5f8969ba55b519fcad04694031383dd':
  Update lists for SMS