diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-01-30 23:41:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 23:41:10 +0000 |
| commit | 5c37c8e66227b15d471047e7c4c986cf3c67876a (patch) | |
| tree | e99bb11738df0e998d5af9ed75454f5e469a6e01 | |
| parent | feb362a5d194b30226caf2efbaae77991007c65c (diff) | |
| parent | d801a1238392b8c7a8e0131cee89370143363046 (diff) | |
| download | frameworks_base-5c37c8e66227b15d471047e7c4c986cf3c67876a.zip frameworks_base-5c37c8e66227b15d471047e7c4c986cf3c67876a.tar.gz frameworks_base-5c37c8e66227b15d471047e7c4c986cf3c67876a.tar.bz2 | |
am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit 'd801a1238392b8c7a8e0131cee89370143363046':
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 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> |