am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev
am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev

* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6':
  Make MediaRouter ignore remembered wifi displays when wifi display is off

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base