| commit | 54fd2ab2a95f261d55b9a8630dc121c8b24ee3a8 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed May 29 15:15:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 29 15:15:58 2013 -0700 |
| tree | 16546c6dec189bb4cd0346399c85b0dfe52a7128 | |
| parent | de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17 [diff] | |
| parent | 04a36f704ac2c646ebc4c29f6b26f3c907dab7f8 [diff] |
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 '04a36f704ac2c646ebc4c29f6b26f3c907dab7f8': 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