am 10479a29: Merge "Clean up behavior of type arguments for...
am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
* commit '10479a29':
Clean up behavior of type arguments for MediaRouter#getSelectedRoute