summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2015-07-09 03:25:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-09 03:25:40 +0000
commit9d5df5ca0491dcb2309c81ec497137f5d7c7a602 (patch)
tree3773ffbf19568c92d0e16077dfa11bfa3a7a4e1f /docs
parentdde5e2635588b1949fbda31ef096b0ee838ae761 (diff)
parent4e1cc12004ed21836097eefda70c0c73c421e038 (diff)
downloadframeworks_base-9d5df5ca0491dcb2309c81ec497137f5d7c7a602.zip
frameworks_base-9d5df5ca0491dcb2309c81ec497137f5d7c7a602.tar.gz
frameworks_base-9d5df5ca0491dcb2309c81ec497137f5d7c7a602.tar.bz2
Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
Diffstat (limited to 'docs')
-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 9c75008..954ca65 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>