commit 52c39c27e9f5fde74e2d326c6a3560334fbea926
author Joe Fernandez <joefernandez@google.com> Sat Jan 31 00:29:37 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 31 00:29:37 2015 +0000
tree 05d84c8ad0f1c0694ed7f40d13bd0bcdc2cbada1
parent ff526fa7106fd45bfc4f1606fe051000c5201920
parent 95fa88250a1957c7adfbd35d52f62e42cbe03df6

am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6
automerge: 95fa882

* commit '95fa88250a1957c7adfbd35d52f62e42cbe03df6':
  docs: studio emulator platform update

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>