diff options
| author | 2015-01-31 00:14:39 +0000 | |
|---|---|---|
| committer | 2015-01-31 00:14:39 +0000 | |
| commit | 3548de60735a79d3e7087c26ae491a7f38da5b4d (patch) | |
| tree | a71d829db75191577b93773d633b014860f4f0cb | |
| parent | 90d5bd8daab404afc50470f5c19ea725bd2466fe (diff) | |
| parent | 5c37c8e66227b15d471047e7c4c986cf3c67876a (diff) | |
am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
| -rw-r--r-- | docs/html/tools/devices/emulator.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/tools/devices/emulator.jd b/docs/html/tools/devices/emulator.jd index 42240b912116..5bdd4e2d4bf7 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> |