OSDN Git Service

Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
authorScott Main <smain@google.com>
Mon, 20 May 2013 19:26:48 +0000 (19:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 May 2013 19:26:49 +0000 (19:26 +0000)

Trivial merge