tree caed6ed3f5b3a32a1246f82754f73ab8a7929997
parent bc83d65ea629d0213064d35d5efcabd7d67f2857
parent 1472d1f6c79ddc01b72c5f08d8afd711c3191eb4
author Wei Jia <wjia@google.com> 1496784806 +0000
committer android-build-merger <android-build-merger@google.com> 1496784806 +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 am: 6d8f3b8240
am: 1472d1f6c7

Change-Id: I05d92c01e6666524a71e07b4e4da96e69a08f511