summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/testing
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-02 16:51:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-02 16:51:06 -0700
commit7cf6aaf9bca84b4f01b55088cf4d3f705577a0cb (patch)
tree6f6b3952fa8e2237d5e831781d6f8e3d6432485d /docs/html/tools/testing
parent7d2301965621ccd10b0ab7afba37fffcc566b05a (diff)
parent70e99bfe409b5cb116bf3f0512e3d05c13240eea (diff)
downloadframeworks_base-7cf6aaf9bca84b4f01b55088cf4d3f705577a0cb.zip
frameworks_base-7cf6aaf9bca84b4f01b55088cf4d3f705577a0cb.tar.gz
frameworks_base-7cf6aaf9bca84b4f01b55088cf4d3f705577a0cb.tar.bz2
am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
* commit '70e99bfe409b5cb116bf3f0512e3d05c13240eea': Doc update: Misc doc bugs
Diffstat (limited to 'docs/html/tools/testing')
-rw-r--r--docs/html/tools/testing/testing_android.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/tools/testing/testing_android.jd b/docs/html/tools/testing/testing_android.jd
index acf5ec2..10843e8 100644
--- a/docs/html/tools/testing/testing_android.jd
+++ b/docs/html/tools/testing/testing_android.jd
@@ -111,14 +111,14 @@ parent.link=index.html
</li>
<li>
The SDK tools for building and tests are available in Eclipse with ADT, and also in
- command-line form for use with other IDES. These tools get information from the project of
+ command-line form for use with other IDEs. These tools get information from the project of
the application under test and use this information to automatically create the build files,
manifest file, and directory structure for the test package.
</li>
<li>
The SDK also provides
<a href="{@docRoot}tools/help/monkeyrunner_concepts.html">monkeyrunner</a>, an API
- testing devices with Python programs, and <a
+ for testing devices with Python programs, and <a
href="{@docRoot}tools/help/monkey.html">UI/Application Exerciser Monkey</a>,
a command-line tool for stress-testing UIs by sending pseudo-random events to a device.
</li>