OSDN Git Service

am ca378ad4: (-s ours) am 25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option...
authorJoe Onorato <joeo@google.com>
Thu, 16 Sep 2010 16:43:23 +0000 (09:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 16:43:23 +0000 (09:43 -0700)
commit82e9f2a9c8afce16c767ec8fa9a3ac5b7f92081e
treec3822712a7cda521ec63141435202b5b20c07bb0
parent8b566d137d56371d2d568c645b74cb5814cbe241
parentca378ad41295ed23e3dce9d9ce824e5b1ab0bffb
am ca378ad4: (-s ours) am 25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread

Merge commit 'ca378ad41295ed23e3dce9d9ce824e5b1ab0bffb'

* commit 'ca378ad41295ed23e3dce9d9ce824e5b1ab0bffb':
  DO NOT MERGE - Add a -knowntags option to droiddoc