tree 8a99e8ba0a5dcf78af28746c3dbdd34bf0d362fd
parent c572616245a015dae86b7ba6c608c621e1b99326
parent 0cb6c1f2b381f39b00f8a98388bf52482737bc4c
author Wei Jia <wjia@google.com> 1496781922 +0000
committer android-build-merger <android-build-merger@google.com> 1496781922 +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

Change-Id: I387bb015e84b6a32eef251860a9369c30eb7e8f6