summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-12-16 01:32:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-16 01:32:49 +0000
commit9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8 (patch)
tree1c8f5d95faf97e29bca6235125bcc5ec93efa365 /docs
parent556ce7f145de641e0f920ed3059be5a82eb0bb7b (diff)
parent72268ad3d4ecdeaee47ad8de0ec372bb834255c7 (diff)
downloadframeworks_base-9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8.zip
frameworks_base-9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8.tar.gz
frameworks_base-9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8.tar.bz2
am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
automerge: 72268ad * commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7': docs: studio basics typo
Diffstat (limited to 'docs')
-rw-r--r--docs/html/tools/studio/index.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 7480f57..5b36d5d 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -338,7 +338,7 @@ Intel&#174; HAXM emulator accelerator.</p>
<p>An updated setup wizard walks you through the setup processes as
the wizard updates your system image and emulation requirements, such GPU, and then creates
-an optimized default Android Virtual Device (AVD) based on Android 5 (Lollipop) for speedie and
+an optimized default Android Virtual Device (AVD) based on Android 5 (Lollipop) for speedy and
reliable emulation. </p>
<p><img src="{@docRoot}images/tools/studio-setup-wizard.png" /></p>
<p class="img-caption"><strong>Figure 8.</strong> Setup Wizard</p>
@@ -377,7 +377,7 @@ code-level preference:
the test of time. They are updated roughly bi-weekly or monthly.</li>
<li><strong>Beta channel</strong>: Beta builds are used for beta-quality releases before a
production release.</li>
- <li><strong>Stable channel</strong>: Used for stable, production-read versions.</li>
+ <li><strong>Stable channel</strong>: Used for stable, production-ready versions.</li>
</ul>
</p>