am 33372b21: Merge "A few updates for TVs." into ics-mr1
am 33372b21: Merge "A few updates for TVs." into ics-mr1

* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.

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