Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair

Browse Source 
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp

* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
  doc change only: Update announcement and mwc redirect to point to microsite.
This commit is contained in:
Dirk Dougherty
2010-01-26 18:05:23 -08:00
committed by Android Git Automerger
parent fbf977be54 965f4a6b4b
commit 67a658567a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/index.jd
View File

@@ -13,7 +13,7 @@ home=true
<!-- total max width is 520px --> <!-- 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;"/> <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"> <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&nbsp;&raquo;</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet&nbsp;&raquo;</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&nbsp;&raquo;</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet&nbsp;&raquo;</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 &raquo;</a></p>
<!--<p><a href="http://android-developers.blogspot.com/2009/11/bring-your-lab-coats.html">Learn more &raquo;</a></p>--> <!--<p><a href="http://android-developers.blogspot.com/2009/11/bring-your-lab-coats.html">Learn more &raquo;</a></p>-->
</div> <!-- end annoucement --> </div> <!-- end annoucement -->
</div> <!-- end annoucement-block --> </div> <!-- end annoucement-block -->

2
docs/html/mwc2010/index.html
View File

@@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title>Redirecting...</title> <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> </head>
<body> <body>
</body> </body>