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