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)
am: aeb22ce3c3

Change-Id: I0dd53319f8e7ad2e0088486f272ea5eea772207a


Trivial merge