tree ca68b4e9ca717265386ccf60185a7304d76ac1cf
parent 3b7c22257a3e64d60fab5b30150e005508125b80
parent 7726b9f2d18d5b17aa806092a9234601a6f371fa
author Marco Nelissen <marcone@google.com> 1458339795 +0000
committer android-build-merger <android-build-merger@google.com> 1458339795 +0000

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

* commit '7726b9f2d18d5b17aa806092a9234601a6f371fa':
  Add VPX output buffer size check