Merge "Fix a macro definition"
authorYaowu Xu <yaowu@google.com>
Tue, 29 Sep 2015 17:22:49 +0000 (17:22 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 29 Sep 2015 17:22:49 +0000 (17:22 +0000)

Trivial merge