tree d8aae1d1a4d0b6a15386afa95b8ecb26a8cd9ce1
parent ba76e4f4a6dc67c93307983d41b52c6441c7349e
parent f875b213e0655511bc8283f46d701296092838d6
author Dichen Zhang <dichenzhang@google.com> 1550093067 -0800
committer android-build-merger <android-build-merger@google.com> 1550093067 -0800

Merge "NuPlayer2: Call video flush on audio teardown" am: bf430563f8 am: d98913f7b5
am: f875b213e0

Change-Id: Ib523ce5acae56fa834da438e14f71ba54d8e5ed5