tree 3c98e2e95d10082ec818324192be65728c7c5554
parent 4ec72fb10684276b048d5b3a6ba7a88d43b06411
parent ceb214959c6af1945c48599feb0e6b8e4e42c1e0
author Colin Cross <ccross@android.com> 1442960540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442960540 +0000

am ceb21495: Merge "Fix libvpx clang build"

* commit 'ceb214959c6af1945c48599feb0e6b8e4e42c1e0':
  Fix libvpx clang build