Merge "Change to use correct check for halfpel"
authorYaowu Xu <yaowu@google.com>
Fri, 13 May 2016 01:27:47 +0000 (01:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 13 May 2016 01:27:47 +0000 (01:27 +0000)

Trivial merge