OSDN Git Service

am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1...
authorScott Main <smain@google.com>
Mon, 20 May 2013 19:28:54 +0000 (12:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 19:28:54 +0000 (12:28 -0700)
* commit 'f943b6def746217db06fc7c33e4d181fc55b87be':
  update video playlists and marquee announcements


Trivial merge