Merge "Suppress or fix clang errors before the fix from upstream."
authorChih-Hung Hsieh <chh@google.com>
Tue, 6 Jan 2015 19:52:15 +0000 (19:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 6 Jan 2015 19:52:15 +0000 (19:52 +0000)

Trivial merge