tree 07ffdd65f9524d9d76632600324e92dc8f4577cb
parent cf3e252fc3a0c9c96ec6f5e675aa5336a05d16c0
parent 786bce09767c5e6d9baf4b290deba9ea9b001e7c
author Marco Nelissen <marcone@google.com> 1556584498 -0700
committer android-build-merger <android-build-merger@google.com> 1556584498 -0700

Merge "oggextractor: fix duration calculation" into qt-dev am: 6f471f0c0a
am: 786bce0976

Change-Id: I149317c3c0b40f5cfd5e471f23ec1b9d8f712043