summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-07-01 17:12:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-01 17:12:39 +0000
commitd88767da1e0eddb4467ff980764afab93db3c6e9 (patch)
tree24c7e2ab15fb4b1b2fe945031292cfc394143d0b /docs
parenta50979997cd3f7a61b95f1c46cb8fddab234afe9 (diff)
parente3d8df63076241a3d3637643e6ff1530bca5a5b2 (diff)
downloadframeworks_base-d88767da1e0eddb4467ff980764afab93db3c6e9.zip
frameworks_base-d88767da1e0eddb4467ff980764afab93db3c6e9.tar.gz
frameworks_base-d88767da1e0eddb4467ff980764afab93db3c6e9.tar.bz2
am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs
* commit 'e3d8df63076241a3d3637643e6ff1530bca5a5b2': docs: studio workflow page typo
Diffstat (limited to 'docs')
-rw-r--r--docs/html/tools/workflow/index.jd14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/tools/workflow/index.jd b/docs/html/tools/workflow/index.jd
index a24a2b0..b32fa26 100644
--- a/docs/html/tools/workflow/index.jd
+++ b/docs/html/tools/workflow/index.jd
@@ -41,16 +41,16 @@ figure 1. The development steps encompass four development phases, which include
<a href="{@docRoot}tools/projects/index.html">Create an Android project</a>.</p>
</li>
<li><strong>Building, Debugging and Testing</strong>
- <p>During this phase you build your project into a debuggable <code>.apk</code> package(s)
- that you can install and run on the emulator or an Android-powered device. Android Studio uses
- a build system based on <a href="http://www.gradle.org/" target="_android">Gradle</a>
- that provides flexibility, customized build variants, dependency resolution, and much more.
- If you're using another IDE, you can build your project using Gradle and install it on a device
+ <p>During this phase you build your project into a debuggable <code>.apk</code> package(s)
+ that you can install and run on the emulator or an Android-powered device. Android Studio uses
+ a build system based on <a href="http://www.gradle.org/" target="_android">Gradle</a>
+ that provides flexibility, customized build variants, dependency resolution, and much more.
+ If you're using another IDE, you can build your project using Gradle and install it on a device
using <a href="{@docRoot}tools/help/adb.html">adb</a>. For more information, see
<a href="{@docRoot}tools/building/index.html">Build and run your application</a>.</p>
<p>Next, with Android Studio you debug your application using the
- <a href="{@docRoot}tools/help/monitor.html">Android Debug Monitor</a> and device log messages
- (<a href="{@docRoot}tools/help/logcat.html">logact</a>) along with the IntelliJ IDEA intelligent
+ <a href="{@docRoot}tools/help/monitor.html">Android Device Monitor</a> and device log messages
+ (<a href="{@docRoot}tools/help/logcat.html">logcat</a>) along with the IntelliJ IDEA intelligent
coding features. You can also use a JDWP-compliant debugger along with the debugging and logging
tools that are provided with the Android SDK. For more information see
<a href="{@docRoot}tools/debugging/index.html">Debug your application with the SDK debugging and logging tools</a>.</p>