Merge changes I59a11921,I296a0b81,I397d7753
authorJohann Koenig <johannkoenig@google.com>
Fri, 1 Jul 2016 18:13:40 +0000 (18:13 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 1 Jul 2016 18:13:41 +0000 (18:13 +0000)
commite616012d694494af66354f059ead49e9ac3aff45
treeadb1cdbe2692d01413b08cb543652d42ac7a0277
parentfbbd3f0d8dfeca8c6513dfa9e1ed1c3dee1f2621
parent571f00cb9532d264c543d996739e336bee3f7134
Merge changes I59a11921,I296a0b81,I397d7753

* changes:
  configure: remove x86inc.asm distinction
  test: remove x86inc.asm distinction
  vpx_dsp: remove x86inc.asm distinction
test/convolve_test.cc