commit 672066778bdf3aacdd859b88484cddbd6c8b7909
author Scott Main <smain@google.com> Fri Oct 15 18:22:09 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 15 18:22:09 2010 -0700
tree 05f7579f58f1c5ab9141a6e53032f9351ff06053
parent b4977f5980fb4045fc12fbb630823ee8deb814d7
parent c0aa1e1b305d85baef1dcedabbea1d084f3ed54a

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.

tools/droiddoc/templates/packages.cs

diff --git a/tools/droiddoc/templates/packages.cs b/tools/droiddoc/templates/packages.cs
index c2d8c75..8650ad1 100644
--- a/tools/droiddoc/templates/packages.cs
+++ b/tools/droiddoc/templates/packages.cs
@@ -22,7 +22,7 @@
 <?cs each:pkg = docs.packages ?>
     <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:pkg.since ?>" >
         <td class="jd-linkcol"><?cs call:package_link(pkg) ?></td>
-        <td class="jd-descrcol" width="100%"><?cs call:tag_list(pkg.shortDescr) ?>&nbsp;</td>
+        <td class="jd-descrcol" width="100%"><?cs call:tag_list(pkg.shortDescr) ?></td>
     </tr>
 <?cs set:count = count + #1 ?>
 <?cs /each ?>