summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-08-02 09:29:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-02 09:29:49 -0700
commit77a66069eb8fa0b99d090effa1d71b1fec992bdd (patch)
tree0cef691be911b8e21b544df1792aea874934ab0b /docs
parent4edd80db956a6a3fc1142371d098ad2abd06ac9c (diff)
parentd3579580df0cea7e37334d83ef7a9aa85ad70368 (diff)
downloadframeworks_base-77a66069eb8fa0b99d090effa1d71b1fec992bdd.zip
frameworks_base-77a66069eb8fa0b99d090effa1d71b1fec992bdd.tar.gz
frameworks_base-77a66069eb8fa0b99d090effa1d71b1fec992bdd.tar.bz2
am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp * commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368': Doc change: Add nexus one to dev phones.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/index.jd11
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 01940e8..f37a122 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -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': {