diff options
| author | Scott Main <smain@google.com> | 2011-04-01 16:19:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-01 16:19:30 -0700 |
| commit | 6261861a94448e4fbc26e313ce1410a184a10914 (patch) | |
| tree | 19b1d50b0b887a59aef988b86bf81c82d51dd65c | |
| parent | 11dd5ae97b1cd5889bb66862fd12718da62a9c75 (diff) | |
| parent | cb719a48a2f2e9bc47b317f75ebb8320f6ce877c (diff) | |
| download | frameworks_base-6261861a94448e4fbc26e313ce1410a184a10914.zip frameworks_base-6261861a94448e4fbc26e313ce1410a184a10914.tar.gz frameworks_base-6261861a94448e4fbc26e313ce1410a184a10914.tar.bz2 | |
am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
| -rw-r--r-- | docs/html/index.jd | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 7fcd7b6..78f71ac 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -11,10 +11,14 @@ home=true </div><!-- end homeTitle --> <div id="announcement-block"> <!-- total max width is 520px --> - <img src="{@docRoot}assets/images/home/GDC2011.png" alt="Android at GDC 2011" width="203px" style="padding-left:22px;padding-bottom:28px;padding-top:22px;"/> + <img src="{@docRoot}assets/images/home/IO-logo-2011.png" +alt="Android at Google IO 2011" width="200px" +style="padding-left:22px;padding-bottom:15px;padding-top:15px;"/> <div id="announcement" style="width:275px"> - <p>Thanks to everyone who visited us at the <a href="http://www.gdconf.com/">Game Developers Conference</a> in San Francisco. We're looking forward to seeing your games running on Android!</p> - <p><a href="http://android-developers.blogspot.com/2011/02/heading-for-gdc.html">Learn more »</a></p> + <p>Google I/O is a two-day developer event that will take place May 10-11 at Moscone Center, San +Francisco. The agenda includes several sessions about Android, presented by Android engineers and +other team members.</p><p><a href="http://www.google.com/events/io/2011/sessions.html">Learn +more »</a></p> </div> <!-- end annoucement --> </div> <!-- end annoucement-block --> </div><!-- end topAnnouncement --> |