diff options
author | Scott Main <smain@google.com> | 2013-05-09 23:30:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-09 23:30:09 +0000 |
commit | 4e3773d3f626595c703d26dea1f354c37ad76bde (patch) | |
tree | 467a6faac3e8b84a490bcc8aad70019b066d0c51 | |
parent | 148ce2322c5ce119b2dc6881d60dc60f8c336bfa (diff) | |
parent | a196e34d0f47edf492487fac3edbac4292c08396 (diff) | |
download | frameworks_base-4e3773d3f626595c703d26dea1f354c37ad76bde.zip frameworks_base-4e3773d3f626595c703d26dea1f354c37ad76bde.tar.gz frameworks_base-4e3773d3f626595c703d26dea1f354c37ad76bde.tar.bz2 |
Merge "update homepage with IO Live banner" into jb-mr1.1-docs
-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"> |