From: Marco Nelissen <marcone@google.com>
Date: Wed, 20 Aug 2014 19:44:54 +0000 (+0000)
Subject: Merge "Fix NuPlayer deadlock" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~852^2~455
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4deb606bca47f971f1ca05e44b934c5328cfb6b7;p=android-x86%2Fframeworks-av.git

Merge "Fix NuPlayer deadlock" into lmp-dev
---

4deb606bca47f971f1ca05e44b934c5328cfb6b7