| commit | 2cca8962327b2d988bf5172e4142268fa3795b57 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon May 20 12:30:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 12:30:38 2013 -0700 |
| tree | 16bba487b04c99bedfb219603699df3ac356a961 | |
| parent | eec9bc2f567f037225e9bea1d0facebeb98a183d [diff] | |
| parent | f657689ab5b7d46e5f3c9dd376c0cb89479a1075 [diff] |
am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev * commit 'f657689ab5b7d46e5f3c9dd376c0cb89479a1075': update video playlists and marquee announcements