diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-01-28 15:10:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-28 15:10:19 -0800 |
| commit | 59e8fc5f53ccb9d575611fb638d992e121fd2c2e (patch) | |
| tree | 3da0f238563a9d6881a9045da6ad01af05489e24 /docs/html | |
| parent | 3869986d6895193f5d88274ad3fa4b4d901d569c (diff) | |
| parent | 67a658567a6bad898c097e615f8efcb3c91fa50d (diff) | |
| download | frameworks_base-59e8fc5f53ccb9d575611fb638d992e121fd2c2e.zip frameworks_base-59e8fc5f53ccb9d575611fb638d992e121fd2c2e.tar.gz frameworks_base-59e8fc5f53ccb9d575611fb638d992e121fd2c2e.tar.bz2 | |
am 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d'
* commit '67a658567a6bad898c097e615f8efcb3c91fa50d':
doc change only: Update announcement and mwc redirect to point to microsite.
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/index.jd | 2 | ||||
| -rw-r--r-- | docs/html/mwc2010/index.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index e12a00a..e3bf685 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -13,7 +13,7 @@ home=true <!-- total max width is 520px --> <img src="/assets/images/home/Android_Dev_Lab_l.png" alt="Android developer labs" width="100px" style="padding-left:78px;padding-right:46px;padding-bottom: 8px;"/> <div id="announcement" style="width:275px"> -<p>We're hosting the next Android Developer Lab in Barcelona at <a href="http://www.mobileworldcongress.com/index.htm">Mobile World Congress »</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet »</a>, located in Hall 7. Come visit us to attend a technical presentation, talk to our Android developer relations team, and meet other members of the developer community.</p><p>Check the Android Developers blog for more information soon!</p> +<p>We're hosting the next Android Developer Lab in Barcelona at <a href="http://www.mobileworldcongress.com/index.htm">Mobile World Congress »</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet »</a>, located in Hall 7. Come visit us to attend a technical presentation, talk to our Android developer relations team, and meet other members of the developer community.</p><p><a href="http://sites.google.com/site/androidmwc/home">Learn more »</a></p> <!--<p><a href="http://android-developers.blogspot.com/2009/11/bring-your-lab-coats.html">Learn more »</a></p>--> </div> <!-- end annoucement --> </div> <!-- end annoucement-block --> diff --git a/docs/html/mwc2010/index.html b/docs/html/mwc2010/index.html index 22319a2..c91386f 100644 --- a/docs/html/mwc2010/index.html +++ b/docs/html/mwc2010/index.html @@ -1,7 +1,7 @@ <html> <head> <title>Redirecting...</title> -<meta http-equiv="refresh" content="0;url=/index.html"> +<meta http-equiv="refresh" content="0;url=http://sites.google.com/site/androidmwc/home"> </head> <body> </body> |