diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2011-02-27 22:37:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-27 22:37:44 -0800 |
| commit | 46054e0c876f245df36a8045d863848c67b77bac (patch) | |
| tree | a8d9c966e2657319e882ffc7ea0c97bb0edbc693 /docs | |
| parent | f272ad210c6834d92b4b4ddaacd069baedf90dcf (diff) | |
| parent | 1649d91f781445a78ce09ed5500503fd96eb9113 (diff) | |
| download | frameworks_base-46054e0c876f245df36a8045d863848c67b77bac.zip frameworks_base-46054e0c876f245df36a8045d863848c67b77bac.tar.gz frameworks_base-46054e0c876f245df36a8045d863848c67b77bac.tar.bz2 | |
am 1649d91f: am a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into honeycomb
* commit '1649d91f781445a78ce09ed5500503fd96eb9113':
Doc change: Add announce for Android at GDC 2011.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/index.jd | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 2248752..f1bb59f 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -11,14 +11,10 @@ home=true </div><!-- end homeTitle --> <div id="announcement-block"> <!-- total max width is 520px --> - <img src="{@docRoot}images/home/market-intl.png" alt="Android -Market" width="104" height="120" style="padding:10px 60px 5px" /> - <div id="announcement" style="width:295px"> -<p>We're pleased to announce that paid apps are available in more locations of the world! Developers -from 20 more locations can now sell paid apps on Android Market. Users in more locations will also -soon be able to purchase apps.</p><p><a -href="http://android-developers.blogspot.com/2010/09/more-countries-more-sellers-more-buyers.html"> -Learn more »</a></p> + <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;"/> + <div id="announcement" style="width:275px"> + <p>Android will be at the <a href="http://www.gdconf.com/">2011 Game Developers Conference</a> in San Francisco, from March 1st to 4th. We're looking forward to seeing you there!</p> + <p><a href="http://android-developers.blogspot.com/2011/02/heading-for-gdc.html">Learn more »</a></p> </div> <!-- end annoucement --> </div> <!-- end annoucement-block --> </div><!-- end topAnnouncement --> |