summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-01-21 13:52:56 -0800
committerRich Slogar <rslogar@google.com>2015-01-21 13:52:56 -0800
commitb01e3fa104664a171b6384196cafd8fda033a983 (patch)
tree66bdbc136caa039b5350b42470247f57ce8eaa08 /docs/html/tools
parentc987ca05010a8cc06572d5b04c93fb6404f8bf45 (diff)
downloadframeworks_base-b01e3fa104664a171b6384196cafd8fda033a983.zip
frameworks_base-b01e3fa104664a171b6384196cafd8fda033a983.tar.gz
frameworks_base-b01e3fa104664a171b6384196cafd8fda033a983.tar.bz2
docs: studio emulator platform update
b/5122160 Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/devices/emulator.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/tools/devices/emulator.jd b/docs/html/tools/devices/emulator.jd
index 42240b9..5bdd4e2 100644
--- a/docs/html/tools/devices/emulator.jd
+++ b/docs/html/tools/devices/emulator.jd
@@ -122,7 +122,7 @@ machine.</p>
mobile devices, including: </p>
<ul>
- <li>An ARMv5 CPU and the corresponding memory-management unit (MMU)</li>
+ <li>An ARMv5, ARMv7, or x86 CPU</li>
<li>A 16-bit LCD display</li>
<li>One or more keyboards (a Qwerty-based keyboard and associated Dpad/Phone
buttons)</li>