summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-01-06 17:50:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-06 17:50:58 +0000
commit91c35ce153aa89f76ce60c6a77e21a4abc7614b5 (patch)
treea6ff98ae2b932b2d92959e6d308dd560dc3d311e
parentacb35e19d12d775bee761bef25c6d1581f015c11 (diff)
parentee371073f16b99979141651f0f0dc6e866c33b89 (diff)
downloadframeworks_base-91c35ce153aa89f76ce60c6a77e21a4abc7614b5.zip
frameworks_base-91c35ce153aa89f76ce60c6a77e21a4abc7614b5.tar.gz
frameworks_base-91c35ce153aa89f76ce60c6a77e21a4abc7614b5.tar.bz2
Merge "docs: studio index typo" into lmp-docs
-rw-r--r--docs/html/tools/studio/index.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 5b36d5d..8662313 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -211,7 +211,7 @@ to refer to your R class and to resolve any relative activity/service registrati
<strong>package="com.example.app"</strong>>
</pre>
-<p class="note"><strong>Note:</strong> If you have multiple manifests (for exmample, a product
+<p class="note"><strong>Note:</strong> If you have multiple manifests (for example, a product
flavor specific manifest and a build type manifest), the package name is optional in those manifests.
If it is specified in those manifests, the package name must be identical to the package name
specified in the manifest in the <code>src/main/</code> folder. </p>
@@ -317,7 +317,7 @@ the device display. </p>
(logcat) in the DDMS pane by clicking <strong>Android</strong> at the bottom of the window.</p>
<p>If you want to debug your app with the
-<ahref="{@docRoot}tools/help/monitor.html">Android Debug Monitor</a>, you can launch it by
+<a href="{@docRoot}tools/help/monitor.html">Android Debug Monitor</a>, you can launch it by
clicking <strong>Monitor</strong>
<img src="{@docRoot}images/tools/monitor-studio.png" style="vertical-align:bottom;margin:0;height:19px"/>
in the toolbar. The Debug Monitor is where you can find the complete set of
@@ -345,7 +345,7 @@ reliable emulation. </p>
<h3>Expanded template and form factor support</h3>
-<p>Android Studio supports new templates for Google Services and expands the availabe device
+<p>Android Studio supports new templates for Google Services and expands the available device
types. </p>
<h4> Android Wear and TV support</h4>