summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2015-07-09 05:34:34 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-09 05:34:34 +0000
commit1f76ee1ada32f445ea6ce5930cd71768f70178cb (patch)
treecb453e85d14576ccc64f6cd0fb2e0f5e1c156c09
parentb32c3bf164074257e9eeb700b8b8915a03887b09 (diff)
parent57470855692713a5ca9fcd14cd4fce5520084f50 (diff)
am 57470855: am 7a0b3c9e: am f1d90977: am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '57470855692713a5ca9fcd14cd4fce5520084f50': Doc change: add x86 to emulator spec.
-rw-r--r--docs/html/preview/support.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 9c7500896f4d..954ca65122e0 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -57,7 +57,7 @@ page.image=images/cards/card-support_16-9_2x.png
<em>Date: July 2015<br>
Build: MPZ79M<br>
Hardware support: Nexus 5,6,9, Player<br>
- Emulator support: ARM 32/64-bit<br>
+ Emulator support: x86 &amp; ARM 32/64-bit<br>
Google Play services: 7.6</em>
</p>
</div>
@@ -321,7 +321,7 @@ page.image=images/cards/card-support_16-9_2x.png
<em>Date: May 2015<br>
Build: MPZ44Q<br>
Hardware support: Nexus 5,6,9, Player<br>
- Emulator support: x86 & ARM (32/64-bit)<br>
+ Emulator support: x86 &amp; ARM (32/64-bit)<br>
Google Play services: 7.5</em>
</p>
</div>