am 6cccadfb: am 434f8172: Merge "Don\'t do a wifi p2p scan in MediaRouter if...
am 6cccadfb: am 434f8172: Merge "Don\'t do a wifi p2p scan in MediaRouter if we\'re already connected" into jb-mr1-dev
* commit '6cccadfb':
Don't do a wifi p2p scan in MediaRouter if we're already connected