diff options
author | Dirk Dougherty <ddougherty@google.com> | 2015-07-09 03:54:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 03:54:37 +0000 |
commit | 95fc4f45deb05318d14ce9a27ad8657a94eee4de (patch) | |
tree | 70b3a44464fc4dcc56a0ba59cc00c849eb8c1325 /docs | |
parent | 064f8b68f9e2404426ba37ce697b52dba6418810 (diff) | |
parent | 9d5df5ca0491dcb2309c81ec497137f5d7c7a602 (diff) | |
download | frameworks_base-95fc4f45deb05318d14ce9a27ad8657a94eee4de.zip frameworks_base-95fc4f45deb05318d14ce9a27ad8657a94eee4de.tar.gz frameworks_base-95fc4f45deb05318d14ce9a27ad8657a94eee4de.tar.bz2 |
am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '9d5df5ca0491dcb2309c81ec497137f5d7c7a602':
Doc change: add x86 to emulator spec.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/preview/support.jd | 4 |
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 & 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 & ARM (32/64-bit)<br> Google Play services: 7.5</em> </p> </div> |