tree 3cc80ad0b7a78983dacc940114fa0bbdbc303a90
parent 417a858c31e10b06f8aff3e7e44f70ce294317cf
parent 1a4edf5b0d30310ec25f4463d336d26f562c88d2
author Dirk Dougherty <ddougherty@google.com> 1274339834 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274339834 -0700

am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.

Merge commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken

* commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
  Doc change: Add new tv to carousel.