commit 2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4
author Joe Fernandez <joefernandez@google.com> Fri Jan 30 23:24:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 30 23:25:51 2015 +0000
tree 175299382c3a4c2e5c3d9e101832d4a92bcf0ff6
parent e0063faa8707e2424a33625aaf2228540fa67e85
parent b01e3fa104664a171b6384196cafd8fda033a983

Merge "docs: studio emulator platform update" into lmp-docs

docs/html/tools/devices/emulator.jd

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 @@
 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>