summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2012-02-23 14:31:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-23 14:31:38 -0800
commita83a6b3ce8f1eb5e0014d8df6e702e0d22805a0c (patch)
treead43c4a407ec1249e193532cbc77068e3fe8424a
parenta23c4ebe04e97a4f5c4e25fa6c9f37c6244ebfe4 (diff)
parentfad35e3b9190c25700c62cc1c4b3d369f5d42a60 (diff)
downloadframeworks_base-a83a6b3ce8f1eb5e0014d8df6e702e0d22805a0c.zip
frameworks_base-a83a6b3ce8f1eb5e0014d8df6e702e0d22805a0c.tar.gz
frameworks_base-a83a6b3ce8f1eb5e0014d8df6e702e0d22805a0c.tar.bz2
am fad35e3b: am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit 'fad35e3b9190c25700c62cc1c4b3d369f5d42a60': docs: NDK overview, remove x86 instruction set mention (b/6044027)
-rw-r--r--docs/html/sdk/ndk/overview.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/sdk/ndk/overview.jd b/docs/html/sdk/ndk/overview.jd
index 85599f7..e969f5d 100644
--- a/docs/html/sdk/ndk/overview.jd
+++ b/docs/html/sdk/ndk/overview.jd
@@ -46,7 +46,7 @@ page.title=What is the NDK?
<li>Documentation, samples, and tutorials</li>
</ul>
- <p>The latest release of the NDK supports these ARM instruction sets:</p>
+ <p>The latest release of the NDK supports the following instruction sets:</p>
<ul>
<li>ARMv5TE (including Thumb-1 instructions)</li>