tree c02d8f5ffe83eb66509fd242bf55bfb3e750c8e9
parent 8f601e7da0d6e716320a61d988ed12058b351890
parent 2d7ef64f47dc409e9e034465bb91f87785b32946
author Jean-Michel Trivi <jmtrivi@google.com> 1505475333 +0000
committer android-build-merger <android-build-merger@google.com> 1505475333 +0000

Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am: 982ee8e6c3
am: 2d7ef64f47

Change-Id: Ib4bd34bf0915afdd3e6c91c2ad34594e1e373a36