commit | 412633baa05c7090015c35e0c6645e337cd7cd14 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Mon May 20 12:33:00 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 12:33:00 2013 -0700 |
tree | 27826e98a1dde66de64a9563497b1ec701ecec47 | |
parent | 5c11e8ee5463b88907814e3e8716af292f90fb86 [diff] | |
parent | 2cca8962327b2d988bf5172e4142268fa3795b57 [diff] |
am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev * commit '2cca8962327b2d988bf5172e4142268fa3795b57': update video playlists and marquee announcements