summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-01-30 02:18:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-30 02:18:32 +0000
commit7dfd737c4ce93896fb82b57b47cc45ffbcc8f73e (patch)
tree846cc0b19bf50dd5be32510492006d86f5bcef5e /docs
parentbed638f292f4fa4460418e46885689ad38f06a08 (diff)
parent9c64950ee269eda596f894c05224b51b8be53739 (diff)
downloadframeworks_base-7dfd737c4ce93896fb82b57b47cc45ffbcc8f73e.zip
frameworks_base-7dfd737c4ce93896fb82b57b47cc45ffbcc8f73e.tar.gz
frameworks_base-7dfd737c4ce93896fb82b57b47cc45ffbcc8f73e.tar.bz2
am 4649dcd7: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge: e9e2707
automerge: 9c64950 * commit '9c64950ee269eda596f894c05224b51b8be53739': docs: linux requirements update
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/index.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index e74d46a..af6f6b8 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -481,14 +481,14 @@ rendering. You can then configure your project to use Java Development Kit (JDK)
<ul>
<li>GNOME or KDE desktop</li>
-<li>GNU C Library (glibc) 2.11 or later</li>
+<li>GNU C Library (glibc) 2.15 or later</li>
<li>2 GB RAM minimum, 4 GB RAM recommended</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>Oracle&reg; Java Development Kit (JDK) 7 </li>
</ul>
-<p>Tested on Ubuntu&reg; 12.04, Precise Pangolin (64-bit distribution capable of running
+<p>Tested on Ubuntu&reg; 14.04, Trusty Tahr (64-bit distribution capable of running
32-bit applications).</p>