OSDN Git Service

Merge "Fix for broken docs build."
authorNeil Fuller <nfuller@google.com>
Tue, 20 Jan 2015 15:18:59 +0000 (15:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 20 Jan 2015 15:18:59 +0000 (15:18 +0000)

Trivial merge