summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2012-02-23 14:24:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-23 14:24:53 -0800
commitc6e3f6f1a758a91d486cbcebb8241f8413c6e770 (patch)
treedfdebbf5e5fae7185730bcc404fec3bcaa882b10
parenta7e1d8d5f7d16cd1004189f9aee727962790b8bf (diff)
parent566328a2a5fcd8c40fc67d8974d6df0df48b0056 (diff)
downloadframeworks_base-c6e3f6f1a758a91d486cbcebb8241f8413c6e770.zip
frameworks_base-c6e3f6f1a758a91d486cbcebb8241f8413c6e770.tar.gz
frameworks_base-c6e3f6f1a758a91d486cbcebb8241f8413c6e770.tar.bz2
am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056': 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>