am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev
am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev

* commit '123436ebd5adc528c23e378bd552d9548a8a27ad':
  MediaRouter/Wireless Display - correct initial state

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