am 4b4a947b: Merge "MediaRouter dialog" into jb-dev

* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
  MediaRouter dialog