tree 41a39b3aca915dc101477179c83db4e6feab31fa
parent 8e55cd3f9586924f4b41cac14f3f0db11311bde8
parent 17b00600b23f56f69b851c3907f2bc049b499d07
author Marco Nelissen <marcone@google.com> 1458338981 +0000
committer android-build-merger <android-build-merger@google.com> 1458338981 +0000

resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66  -s ours am: 30a52a4
am: 17b0060

* commit '17b00600b23f56f69b851c3907f2bc049b499d07':
  Add VPX output buffer size check