OSDN Git Service

am cb92616f: Merge "Add support for multiple html directories to droiddoc." into...
authorRohit Mungee <rohitm@google.com>
Wed, 25 Aug 2010 06:01:32 +0000 (23:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 06:01:32 +0000 (23:01 -0700)
Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp

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


Trivial merge