summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-01-22 16:50:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-22 16:50:03 -0800
commit99988b6ee6c18b3e12f73635467e1fb4ee9aa43a (patch)
treed339066cde6b6fc8fb1c46a86030954d07f87ccd
parent43d5a09f4626d6cc865b7ef138a1cd828363b8f8 (diff)
parent8420795633443221627eb872aea8f2862a38f8b1 (diff)
downloadframeworks_base-99988b6ee6c18b3e12f73635467e1fb4ee9aa43a.zip
frameworks_base-99988b6ee6c18b3e12f73635467e1fb4ee9aa43a.tar.gz
frameworks_base-99988b6ee6c18b3e12f73635467e1fb4ee9aa43a.tar.bz2
am 84207956: Merge "SDK doc change: Misc small fixes." into eclair
Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp * commit '8420795633443221627eb872aea8f2862a38f8b1': SDK doc change: Misc small fixes.
-rw-r--r--docs/html/sdk/android-2.1.jd10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/sdk/android-2.1.jd b/docs/html/sdk/android-2.1.jd
index 7f9141e..ecdc366 100644
--- a/docs/html/sdk/android-2.1.jd
+++ b/docs/html/sdk/android-2.1.jd
@@ -76,22 +76,21 @@ built-in applications:</p>
<li>Alarm Clock</li>
<li>Browser</li>
<li>Calculator</li>
- <li>Camcorder</li>
<li>Camera</li>
<li>Contacts</li>
<li>Custom Locale (developer app)</li>
<li>Dev Tools (developer app)</li>
- <li>Dialer</li>
+ <li>Email</li>
</ul>
</td>
<td style="border:0;padding-bottom:0;margin-bottom:0;padding-left:5em;">
<ul>
- <li>Email</li>
+
<li>Gallery</li>
- <li>Gestures Builder</li>
- <li>IME for Japanese text input</li>
+ <li>IMEs for Japanese, Chinese, and Latin text input</li>
<li>Messaging</li>
<li>Music</li>
+ <li>Phone</li>
<li>Settings</li>
<li>Spare Parts (developer app)</li>
</ul>
@@ -99,6 +98,7 @@ built-in applications:</p>
</tr>
</table>
+
<h2 id="locs" style="margin-top:.75em;">Locales</h2>
<p>The system image included in the downloadable platform provides a variety of