tree 7ef93375dbb3c55a0fcb60013a3cba234872759c
parent ec5c93e0ecd92223a20c049b03f183c588391592
parent f943b6def746217db06fc7c33e4d181fc55b87be
author Scott Main <smain@google.com> 1369078134 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369078134 -0700

am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev

* commit 'f943b6def746217db06fc7c33e4d181fc55b87be':
  update video playlists and marquee announcements