Merge "Added TODOs for two unused #defines"
authorYaowu Xu <yaowu@google.com>
Thu, 23 Jul 2015 00:23:39 +0000 (00:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 23 Jul 2015 00:23:39 +0000 (00:23 +0000)

Trivial merge