tree aab83eac2bdb852ea2e99c64dfab3ff401960e3a
parent b73a717745027f3e405a3c125adc6d929a2a5faf
parent 367499bc42305c511611980aecb40b8414982247
author Wei Jia <wjia@google.com> 1496783275 +0000
committer android-build-merger <android-build-merger@google.com> 1496783275 +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

Change-Id: Ib79ce8adddb4012b3d5051550811a73d140cacd9