Commit 4ba3bc9f authored Jan 31, 2015 by Joe Fernandez Committed by android-build-merger Jan 31, 2015

am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform...

am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de60 automerge: 95fa8825
automerge: 52c39c27

* commit '52c39c27':
  docs: studio emulator platform update

parents 57a093c7 52c39c27

docs/html/tools/devices/emulator.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>