tree befb611c1affea2fa0d06714c28e0065106500d5
parent f3e343c14c30684d93bdec24751cd672aca5cce0
parent 6d8f3b8240d8b16c4dd2370e3fee158d66cb876c
author Wei Jia <wjia@google.com> 1496784359 +0000
committer android-build-merger <android-build-merger@google.com> 1496784359 +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

Change-Id: I860e9e52e684a37509d5bc41f2efd223aac19044