am 67206677: (-s ours) am c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread

Merge commit '67206677'

* commit '67206677':
  remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.