summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2015-07-09 04:22:28 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-09 04:22:28 +0000
commit872c24828ff9e69e2197ea42f72d7537246d0d46 (patch)
tree95a4f64b59e368065c2913491d4cba12f64e37dd
parent15d1c1c95b3d8f25aad81dfdc2fc55028968242e (diff)
parent95fc4f45deb05318d14ce9a27ad8657a94eee4de (diff)
am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '95fc4f45deb05318d14ce9a27ad8657a94eee4de': 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>