summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2009-09-29 08:56:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-29 08:56:21 -0700
commite34569fa54471214c3b58dd23ec17be900240a74 (patch)
treecf628b4f62ab9ee217b5cea2bd9957c52b6a6826 /docs
parent9f9ce253648ad9dda16ae2fd3131073fe5643536 (diff)
parentbc0e07bf9ad21d9237713d58879c00556d70b1f2 (diff)
downloadframeworks_base-e34569fa54471214c3b58dd23ec17be900240a74.zip
frameworks_base-e34569fa54471214c3b58dd23ec17be900240a74.tar.gz
frameworks_base-e34569fa54471214c3b58dd23ec17be900240a74.tar.bz2
am bc0e07bf: Merge change I7b64ad2e into donut
Merge commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2' into eclair * commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2': doc change only. fix toc links on terms page.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/terms.jd2
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/html/sdk/terms.jd b/docs/html/sdk/terms.jd
index ffc574a..614a438 100644
--- a/docs/html/sdk/terms.jd
+++ b/docs/html/sdk/terms.jd
@@ -1,6 +1,4 @@
page.title=Terms and Conditions
-sdk.version=1.6
-sdk.preview=true
hide_license_footer=true
@jd:body