resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am:... (7726b9f2) · Commits · e / os / android_frameworks_av

Commit 7726b9f2 authored Mar 18, 2016 by Marco Nelissen Committed by android-build-merger Mar 18, 2016

resolve merge conflicts of c66f8ddd to lmp-mr1-dev am: 77e43fac am: f79ccd55 am:...

resolve merge conflicts of c66f8ddd to lmp-mr1-dev am: 77e43fac am: f79ccd55 am: 099db660  -s ours am: 30a52a4d am: 17b00600 am: af4637c5
am: 7ac0d8f3

* commit '7ac0d8f3':
  Add VPX output buffer size check

parents 17ec7d74 7ac0d8f3

Hide whitespace changes

Inline Side-by-side

Please register or to comment