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

* commit '424f5b0bc38335a3f2150b32c2a8e56e1cabb0ae':
  Update lists for SMS