tree 158200baaafb1c110c6d3719887d715129fc9ac9
parent 9452f4d899295269f3dc8f3f06c60b757c7d34f9
parent 33372b217ea5e9950560449aa5c86e0f0ddacc74
author Megha Joshi <mjoshi@google.com> 1331238291 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331238291 -0800

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

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