tree 85d27c0db3942350fd40d99184f0d909c5330383
parent e5cfdbfb17b3915b86d8a5eacee0bf1391504795
parent e9b01eb46d461e7cfecb365acf046e2ad56c05a0
author Dirk Dougherty <ddougherty@google.com> 1274339738 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274339738 -0700

am e9b01eb4: Doc change: add tv assets for carousel.

Merge commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp

* commit 'e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
  Doc change: add tv assets for carousel.