OSDN Git Service

Merge "PlayerBase: fix deadlock" into pi-dev
authorJean-Michel Trivi <jmtrivi@google.com>
Thu, 12 Apr 2018 02:05:55 +0000 (19:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Apr 2018 02:05:55 +0000 (19:05 -0700)
am: 437b252c96

Change-Id: Id4e59bb6ded89c96ab5f497760880fcd43a85836


Trivial merge