From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 12 Apr 2018 02:05:55 +0000 (-0700)
Subject: Merge "PlayerBase: fix deadlock" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f1a955bf9ddbbdd11ceea2ee1fed286006e84c1;p=android-x86%2Fframeworks-base.git

Merge "PlayerBase: fix deadlock" into pi-dev
am: 437b252c96

Change-Id: Id4e59bb6ded89c96ab5f497760880fcd43a85836
---

1f1a955bf9ddbbdd11ceea2ee1fed286006e84c1