Merge changes I915beaef,I229dd6ca
authorJames Zern <jzern@google.com>
Wed, 25 Jun 2014 21:26:18 +0000 (14:26 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 25 Jun 2014 21:26:18 +0000 (14:26 -0700)
commitce7199075e551871052de49121905277721062a5
tree9bce96727eddd0db65b9d836b2e4f7476eba5a9e
parent36eeb1799df4827a45bdc21a0e083d9fefc2a0db
parent75cb82d87a1adc3360041772de75c9d2f44f5e72
Merge changes I915beaef,I229dd6ca

* changes:
  vp9cx.mk: move avx c files outside of x86inc block
  test.mk: remove renamed file