tree 9735e91dfc7f8e812e873ca8c67cdafc89ad91d6
parent bd1756ea2f02d5b5d06fc883a7da6f3e8d2e032f
parent 1d2eb44eef5ff0ac24cc9f45d555b45f8d92e9eb
author Dichen Zhang <dichenzhang@google.com> 1560934554 -0700
committer android-build-merger <android-build-merger@google.com> 1560934554 -0700

Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d7628
am: 1d2eb44eef

Change-Id: Ic2cd7d85094f79e19000f451aebea60acd08b831