am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev
am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev

* commit '12c2fbd3b7e98132fe1388b065a5dd09c20ef390':
  Restrict MediaRouter selection

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