OSDN Git Service

am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary...
authorDirk Dougherty <ddougherty@google.com>
Fri, 1 Feb 2013 22:29:41 +0000 (14:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Feb 2013 22:29:41 +0000 (14:29 -0800)
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '18a1a50f981449bb3dbd6bab3ee2502b51259fd7':
  Add new droiddoc option for project-specific secondary html input/output paths.


Trivial merge