am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2

* commit '230ef98728f3b59a81f55dab5129aa50d5f27969':
  DOC CHANGE: Change GTV info on intro page
This commit is contained in:
Joe Malin
2011-07-08 10:41:54 -07:00
committed by Android Git Automerger

View File

@@ -148,19 +148,18 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'tv': {
'layout':"imgLeft",
'icon':"tv_s.png",
'icon':"GTV_icon_small.png",
'name':"Google TV",
'img':"tv_l.png",
'title':"Announcing Google TV!",
'desc': "<p><a href='http://www.google.com/tv/'>Google TV</a> is a new platform "
+ "for television built on Android. Google "
+ "has partnered with Sony and Logitech to integrate "
+ "this platform into TVs, blu-ray players, and companion "
+ "boxes. </p>"
+ "<p><a href='http://www.google.com/tv/'>Learn more about "
+ "Google TV &raquo;</a></p>"
'img':"GTV_icon_large.png",
'title':"Google TV!",
'desc': "<p>Build something big. By big, we mean <em>worthy-of-the-living-room</em> big.</p>"
+ " <p>Use <a href='http://code.google.com/tv'>Google TV</a> to bring the power of Android"
+ " and Google Chrome to television."
+ " The average American watches five hours of TV per day. Give them the web and apps"
+ " to update their status, listen to music, watch web videos, and much more...</p>"
},
'devphone': {
'layout':"imgLeft",
'icon':"devphone-small.png",