tree b72041749519f305be3e17119aca8ddfdedb4ec9
parent 567ec8ede3e7cda75c1f3d474d14d78b12a6765f
parent cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd
author Rohit Mungee <rohitm@google.com> 1282716092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282716092 -0700

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.