tree 5a5012fde3da75ffd7ee23a3043084c0265d4444
parent 30eb3f92bb150de21ea721a4f2324968ab5936e2
parent 612623f9301edf7df0c86090042d20a68d9d3963
author Ray Essick <essick@google.com> 1592439352 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592439352 +0000

Merge "Add support for multi tracks in WriterTest and ListenerTest" am: 0eb4ef2828 am: 62739ebed6 am: 612623f930

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1299384

Change-Id: If50039a260e71b30cb599d5c9244c116e5f6fa62