tree 1b275fda75ec2d1a830ce390ee557f54c921a264
parent bb0a160229cdfc86529517905b60d0ace2dd2172
parent 33372b217ea5e9950560449aa5c86e0f0ddacc74
author Megha Joshi <mjoshi@google.com> 1331238308 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331238308 -0800

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

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