tree 05f7579f58f1c5ab9141a6e53032f9351ff06053
parent b4977f5980fb4045fc12fbb630823ee8deb814d7
parent c0aa1e1b305d85baef1dcedabbea1d084f3ed54a
author Scott Main <smain@google.com> 1287192129 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287192129 -0700

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 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp

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