| commit | d0a87a5d141347d6cf5862b743807fce37ffddc4 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed May 29 15:19:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 29 15:19:22 2013 -0700 |
| tree | 21eedd1370459d0058e1d87e50d6818bde3ae925 | |
| parent | f64588a2ce6a0e4e76d7d48c47f82785553b13f3 [diff] | |
| parent | 54fd2ab2a95f261d55b9a8630dc121c8b24ee3a8 [diff] |
am 54fd2ab2: am 04a36f70: Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev * commit '54fd2ab2a95f261d55b9a8630dc121c8b24ee3a8': add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later