diff options
| author | Scott Main <smain@google.com> | 2013-05-09 18:04:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-09 18:04:00 -0700 |
| commit | 77d7e0a36234b8981c25232d6c35b4fd64d1c083 (patch) | |
| tree | 40441fc17a82f541d979fb6c1a02a4b15288f8e1 /docs/html | |
| parent | 0055383554983842c5d7bab25a981c6eb804a38c (diff) | |
| parent | 3676cbb61a4c59957c2a8cb3a257ff2ce0a02597 (diff) | |
| download | frameworks_base-77d7e0a36234b8981c25232d6c35b4fd64d1c083.zip frameworks_base-77d7e0a36234b8981c25232d6c35b4fd64d1c083.tar.gz frameworks_base-77d7e0a36234b8981c25232d6c35b4fd64d1c083.tar.bz2 | |
am 3676cbb6: am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs
* commit '3676cbb61a4c59957c2a8cb3a257ff2ce0a02597':
update homepage with IO Live banner
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/images/home/io-gdl-2013.png | bin | 0 -> 31617 bytes | |||
| -rw-r--r-- | docs/html/index.jd | 17 |
2 files changed, 8 insertions, 9 deletions
diff --git a/docs/html/images/home/io-gdl-2013.png b/docs/html/images/home/io-gdl-2013.png Binary files differnew file mode 100644 index 0000000..78b6820 --- /dev/null +++ b/docs/html/images/home/io-gdl-2013.png diff --git a/docs/html/index.jd b/docs/html/index.jd index ce3d9ad..c9e508e 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -14,18 +14,17 @@ page.metaDescription=The official site for Android developers. Provides the Andr <ul> <li class="item carousel-home"> <div class="content-left col-10"> - <a href="https://developers.google.com/events/io/io-extended/?utm_source=site&utm_medium=emb&utm_campaign=extended-android-site"> - <img src="{@docRoot}images/home/io-extended-2013.png" style="margin:90px 0 0"> + <a href="http://goo.gl/9lM2d"> + <img src="{@docRoot}images/home/io-gdl-2013.png" style="margin:60px 0 0"> </a> </div> <div class="content-right col-5"> - <h1>Google I/O Extended</h1> - <p>Android will be at Google I/O on May 15-17, 2013, with sessions covering topics - such as design, performance, and how to enhance your app with the latest Android features.</p> - <p>Even if you can't make it there, you can experience the excitement and innovation of - Google I/O remotely with Google I/O Extended.</p> - <p><a href="https://developers.google.com/events/io/io-extended/?utm_source=site&utm_medium=emb&utm_campaign=extended-android-site" - >Organize or attend an event near you »</a></p> + <h1>Google I/O Live Stream</h1> + <p>Watch Android sessions live from Google I/O 2013. Hear about the latest in + Android straight from the source.</p> + <p>Brought to you by + <a href="http://developers.google.com/live">Google Developers Live</a>.</p> + <p><a href="http://goo.gl/9lM2d" class="button">Tune in now</a></p> </div> </li> <li class="item carousel-home"> |
