am 66104e1e: am 521eeaef: Merge "Make MediaRouter ignore remembered wifi...
am 66104e1e: am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev
* commit '66104e1e':
Make MediaRouter ignore remembered wifi displays when wifi display is off