summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-12-16 15:32:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-16 15:32:22 -0800
commit7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9 (patch)
tree49c81a4b6a01d120d1f4a0354f590693eb5b7b06 /docs/html
parent50e72439648dc36205ad307a07f3050270346308 (diff)
parentb2aab5042b4f13ab58b04fef192f11522b0bf7a7 (diff)
downloadframeworks_base-7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9.zip
frameworks_base-7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9.tar.gz
frameworks_base-7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9.tar.bz2
am b2aab504: Merge change I354261e2 into eclair
Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp * commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7': docs: small edit to live wallpaper sentence
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/sdk/android-2.1.jd3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/html/sdk/android-2.1.jd b/docs/html/sdk/android-2.1.jd
index ef6a391..7f9141e 100644
--- a/docs/html/sdk/android-2.1.jd
+++ b/docs/html/sdk/android-2.1.jd
@@ -211,8 +211,7 @@ href="{@docRoot}guide/appendix/api-levels.html">API Levels</a> document. </p>
<h4>Live Wallpapers</h4>
-<p>The following additions provide APIs for you to develop active (and
-interactive) wallpapers:</p>
+<p>The following additions provide APIs for you to develop animated wallpapers:</p>
<ul>
<li>New {@link android.service.wallpaper} package.</li>
<li>New {@link android.app.WallpaperInfo} class.</li>