am 40277df7: Merge "Add "television" mode." into honeycomb-mr2

* commit '40277df7c33c0fc381eec589c768fe86de4b4404':
  Add "television" mode.