Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46defea authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo 

Merge commit '68b37d14' into kraken

* commit '68b37d14':
  Doc change: remove Google I/O 09 from carousel.
parents afbc5fad 68b37d14

docs/html/index.jd

+0 −9
Original line number Diff line number Diff line
@@ -177,15 +177,6 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</ 
      'img':"maps-large.png",

      'title':"Maps API Key",

      'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='http://code.google.com/android/add-ons/google-apis/maps-overview.html'>Learn more &raquo;</a></p>"

    },



    'io': {

      'layout':"imgLeft",

      'icon':"io-small.png",

      'name':"Google I/O '09'",

      'img':"io-large.png",

      'title':"2009 Google I/O Developer Conference",

      'desc': "<p>The 2009 Google I/O developer conference took place May 27-28, 2009, in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"

    }



  }