summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-03-15 15:52:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-15 15:52:56 -0700
commiteb1d42e4faa34c2acf76200913920fd5ca46a39e (patch)
tree50bda98822b4597eaa9dc4de804454f8c4e2328d /docs/html/sdk
parent33ace979a452301796694ffd64506f082de42f0d (diff)
parent8edad6f16fc1d60a163e0f63153ff4f8a95e6c0e (diff)
downloadframeworks_base-eb1d42e4faa34c2acf76200913920fd5ca46a39e.zip
frameworks_base-eb1d42e4faa34c2acf76200913920fd5ca46a39e.tar.gz
frameworks_base-eb1d42e4faa34c2acf76200913920fd5ca46a39e.tar.bz2
Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
Diffstat (limited to 'docs/html/sdk')
-rw-r--r--docs/html/sdk/android-4.0-highlights.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/sdk/android-4.0-highlights.jd b/docs/html/sdk/android-4.0-highlights.jd
index 50e9a14..98f467d 100644
--- a/docs/html/sdk/android-4.0-highlights.jd
+++ b/docs/html/sdk/android-4.0-highlights.jd
@@ -343,7 +343,7 @@ capabilities</strong></p>
<p>The Camera app includes many new features that let users capture special moments
with great photos and videos. After capturing images, they can edit and share
-them easily with friemds. </p>
+them easily with friends. </p>
<p>When taking pictures, <strong>continuous focus</strong>, <strong>zero shutter
lag exposure</strong>, and decreased shot-to-shot speed help capture clear,