diff options
| author | 2015-01-30 23:34:44 +0000 | |
|---|---|---|
| committer | 2015-01-30 23:34:44 +0000 | |
| commit | d801a1238392b8c7a8e0131cee89370143363046 (patch) | |
| tree | 0ac323fb2c5084a4da112c4564b202a94f4a1de8 | |
| parent | a0d3bfbe8736fd638621ae48371b6e4e237ed4b1 (diff) | |
| parent | 2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4 (diff) | |
am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
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> |