| commit | 4f2c268e5e3cf9b634c80f2d1c353e2f161512e3 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon May 20 12:38:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 12:38:05 2013 -0700 |
| tree | fe2a8b6990967eb43f2ec5370d23ec2fded4e455 | |
| parent | e0fc1875492cf1e59fe3ae4e0b1a5020672962bb [diff] | |
| parent | f3a5682bbabd4df28f4d410445262afabcff26ee [diff] |
am f3a5682b: am 412633ba: am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev * commit 'f3a5682bbabd4df28f4d410445262afabcff26ee': update video playlists and marquee announcements