tree 8646de6922dc4b8adedaaf692883b8c7aff2d59c
parent e6714284a250fe474e57cc9744e08c76e23c5c3b
parent 51f680ff847faab98eae58dfb7da849c7a5bff39
author Marco Nelissen <marcone@google.com> 1543434694 -0800
committer android-build-merger <android-build-merger@google.com> 1543434694 -0800

Merge "Set duration to audio track format in MPEG2TSExtractor" am: 60109b6bf5 am: 71d2bd32a8
am: 51f680ff84

Change-Id: I3203a8f8a6aee688a3b877730555cbc76578a7c9