OSDN Git Service

Merge "Show media stream with remote streams" into pi-dev
authorJulia Reynolds <juliacr@google.com>
Wed, 11 Apr 2018 02:53:14 +0000 (19:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 02:53:14 +0000 (19:53 -0700)
commita34134c991d66c2c24fb739f26900afc0d7bf704
treef99b4219afe3447eb39b6acd8cf346656ae1c1ce
parentf4bf387e9de1e733f03b9f7c23b26982850baae7
parentaeb22ce3c3060fe029527b9d01c23b095dd5e8ee
Merge "Show media stream with remote streams" into pi-dev
am: aeb22ce3c3

Change-Id: I0dd53319f8e7ad2e0088486f272ea5eea772207a