am cdc1d6f4: (-s ours) am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread

Merge commit 'cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56'

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