tree b53d05dda4ccb59a6dff79d19ae0d4e6019adc45
parent 0aed763b998016be734b8473bbb77cdfef253594
parent ee4926b3033899028886c7407f75bcf55e708192
author Conrad Chen <conradchen@google.com> 1501802074 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501802074 +0000

Merge "MediaRouter: Fix race condition between selecting routes" into oc-support-26.0-dev