OSDN Git Service

am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific...
authorDirk Dougherty <ddougherty@google.com>
Mon, 4 Feb 2013 17:07:28 +0000 (09:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Feb 2013 17:07:28 +0000 (09:07 -0800)
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '34eb13de682225fbb6453f606ed75b3460c0a57d':
  Add new droiddoc option for project-specific secondary html input/output paths.


Trivial merge