OSDN Git Service

Merge "Source of deadlock between PlayerBase.mLock and PlaybackActivityMonitor...
authorJean-Michel Trivi <jmtrivi@google.com>
Tue, 17 Apr 2018 01:55:00 +0000 (18:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Apr 2018 01:55:00 +0000 (18:55 -0700)
commit064cd7b3dbe2b27a6a028f96bd30f43603915329
treec92360f1323b37c2a2f5777aa3ef457d1382288a
parentcca80fbe4cd261c9949737a606b0a4f560793d41
parentd53bd6b86e89cc5f21fc783ef3590878f46b2480
Merge "Source of deadlock between PlayerBase.mLock and   PlaybackActivityMonitor.mPlayerLock:"
am: d53bd6b86e

Change-Id: I1408348aa98c9442de544b22cd9cddb9a1eac907