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

Commit d3579580 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo

Merge commit '9cd79790' into gingerbread

* commit '9cd79790':
  Doc change: Add nexus one to dev phones.
parents ee34a49f 9cd79790
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -163,12 +163,11 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
      'img':"devphone-large.png",
      'title':"Android Dev Phones",
      'desc': "<p>Run and debug your Android applications directly on one of these "
 + "device. Modify and rebuild the Android operating system, and flash it onto "
 + "the phone. The Android Dev Phones are carrier independent, and available for "
 + "purchase by any developer registered with <a "
 + "href='http://market.android.com/publish'>Android Market</a>.</p><p><a "
 + "href='/guide/developing/device.html#dev-phone-1'>Learn more about the "
 + "Android Dev Phones &raquo;</a></p>"
 + "devices. Modify and rebuild the Android operating system, and flash it onto "
 + "the phone. The Android Dev Phones are carrier-independent, and available for "
 + "purchase by developers through their Android Market publisher accounts.</p><p> "
 + "<a href='http://market.android.com/publish'>Visit Android Market "
 + "to learn more &raquo;</a></p>"
    },

    'mapskey': {