tree dc1bf180c9df17141de4b793d89ed4a403dea2ce
parent 5f37f224d8445d8e2ffa34d9b74c27076d9bb8ab
parent dfe23fc3e7f191aa804ac28016dd5b0f42f73c03
author Sungsoo Lim <sungsoo@google.com> 1523346027 -0700
committer android-build-merger <android-build-merger@google.com> 1523346027 -0700

[automerger skipped] Merge "Enable cast via MediaSession2/MediaController2" into pi-preview1-androidx-dev
am: dfe23fc3e7  -s ours

Change-Id: I0c94308aa9b784efe804a7e01e824ab2f8b3b36e