tree ad628f7e316c80519834f5b3fae44d32bc9b1814
parent 53ee1b675b72f87a881de8ea7016785646d43d14
parent a087c3fc939faca9f4ec5f1f38960336814f1191
author Wei Jia <wjia@google.com> 1496783514 +0000
committer android-build-merger <android-build-merger@google.com> 1496783514 +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

Change-Id: I870b467ebfb350508872c8115ebe04f48650c73b