diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-01-16 20:18:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 20:18:33 +0000 |
| commit | 46d2b80fe2eb3abf6fa5bc1540fa3e176b20dbb0 (patch) | |
| tree | c5d26b32ca341a6ae48469fde2d714f14ec716a7 /docs/html/sdk | |
| parent | c2c9107fb90ea372013eafac9151ac75a5eb69ef (diff) | |
| parent | 8871470cedf4f6863fbba8c7d253607a9bac0246 (diff) | |
| download | frameworks_base-46d2b80fe2eb3abf6fa5bc1540fa3e176b20dbb0.zip frameworks_base-46d2b80fe2eb3abf6fa5bc1540fa3e176b20dbb0.tar.gz frameworks_base-46d2b80fe2eb3abf6fa5bc1540fa3e176b20dbb0.tar.bz2 | |
am 8871470c: am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
* commit '8871470cedf4f6863fbba8c7d253607a9bac0246':
docs: studio disk space requirements typo
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/index.jd | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index c85df43..e74d46a 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -419,7 +419,8 @@ href="" >Download Android Studio</a> <li>Rich layout editor with support for theme editing.</li> <li>Lint tools to catch performance, usability, version compatibility, and other problems.</li> <li>ProGuard and app-signing capabilities.</li> - <li>Built-in support for Google Cloud Platform, making it easy to integrate Google Cloud Messaging and App Engine.</li> + <li>Built-in support for Google Cloud Platform, making it easy to integrate Google Cloud + Messaging and App Engine.</li> </ul> <p style="margin:0"> @@ -448,7 +449,8 @@ Studio</a>.</p> <ul> <li>Microsoft® Windows® 8/7/Vista/2003 (32 or 64-bit)</li> <li>2 GB RAM minimum, 4 GB RAM recommended</li> -<li>400 MB hard disk space + at least 1 GB for Android SDK, emulator system images, and caches</li> +<li>400 MB hard disk space</li> +<li>At least 1 GB for Android SDK, emulator system images, and caches</li> <li>1280 x 800 minimum screen resolution</li> <li>Java Development Kit (JDK) 7 </li> <li>Optional for accelerated emulator: Intel® processor with support for Intel® VT-x, Intel® EM64T |