tree 729a98533b9d101d029556ca290d9524bd4b416e
parent e9e9274941b41e9cc7ef1bc332faa1e29b9da11a
parent 0f690d9eda1893e66223138d2b930eb3e0164820
author Elliott Hughes <enh@google.com> 1402629425 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402629425 +0000

am 0f690d9e: Merge "Fix x86-64 libvpx build."

* commit '0f690d9eda1893e66223138d2b930eb3e0164820':
  Fix x86-64 libvpx build.