commit 872c24828ff9e69e2197ea42f72d7537246d0d46
author Dirk Dougherty <ddougherty@google.com> Thu Jul 09 04:22:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 09 04:22:28 2015 +0000
tree 95a4f64b59e368065c2913491d4cba12f64e37dd
parent 15d1c1c95b3d8f25aad81dfdc2fc55028968242e
parent 95fc4f45deb05318d14ce9a27ad8657a94eee4de

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.

docs/html/preview/support.jd

diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 9c75008..954ca65 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -57,7 +57,7 @@
         <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 @@
         <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>