tree fdc702b616fa640743869f477c663e5a642062ca
parent 9e8374c799192ec34ac9b89a376191a98d50c2cd
parent 5fdc249beb53ccbd3bb545bc11afa2486f405328
author Wei Jia <wjia@google.com> 1496785252 +0000
committer android-build-merger <android-build-merger@google.com> 1496785252 +0000

Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3 am: a0f88fe10b am: 3905eac9c0 am: 1c724844d8 am: ab6bb51371 am: 367499bc42 am: a087c3fc93 am: b8eb299886 am: d206fc5664 am: 6d8f3b8240 am: 1472d1f6c7
am: 5fdc249beb

Change-Id: If514a212fad3e06e1142049caf350dbba0c5c7ed