tree 5c7a344d88f51cb3d7b8de5597c01e9af98fb52c
parent ce85c6646e8ec4791090231aa14d397b710536a3
parent d206fc5664b6939c3ecc813e02f1b1177ea932f8
author Wei Jia <wjia@google.com> 1496784012 +0000
committer android-build-merger <android-build-merger@google.com> 1496784012 +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

Change-Id: If5e76c48ee3cabd10f41bc4dbe5ec5198f8324ba