am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread

Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp

* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
  Add support for multiple html directories to droiddoc.