OSDN Git Service

am cdc1d6f4: (-s ours) am cb92616f: Merge "Add support for multiple html directories...
authorRohit Mungee <rohitm@google.com>
Wed, 25 Aug 2010 06:15:23 +0000 (23:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 06:15:23 +0000 (23:15 -0700)
Merge commit 'cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56'

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


Trivial merge