Merge "Add option to disable documentation"
authorJohn Koleszar <jkoleszar@google.com>
Thu, 11 Oct 2012 16:55:06 +0000 (09:55 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 11 Oct 2012 16:55:06 +0000 (09:55 -0700)

Trivial merge