tree 68e381093ff9cb6619068129c8048e5ea2161d81
parent 8bd081a57f27f704546f0cf1dc1cdffe4e93d40d
parent ab6bb51371ca519a45b2be9132b381c1756650ab
author Wei Jia <wjia@google.com> 1496782974 +0000
committer android-build-merger <android-build-merger@google.com> 1496782974 +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

Change-Id: Id7b3bf6e2a884982305b253d84c045287471c29a