OSDN Git Service

Merge "Fix NuPlayer deadlock" into lmp-dev
authorMarco Nelissen <marcone@google.com>
Wed, 20 Aug 2014 19:44:54 +0000 (19:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Aug 2014 02:43:23 +0000 (02:43 +0000)

Trivial merge