am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs

automerge: 3548de6

* commit '3548de60735a79d3e7087c26ae491a7f38da5b4d':
  docs: studio emulator platform update
This commit is contained in:
Joe Fernandez
2015-01-31 00:25:04 +00:00
committed by android-build-merger

View File

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