summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-01-30 02:12:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-30 02:12:02 +0000
commitd498a8ebb740af821693bb328eab16b6e291c003 (patch)
tree507bab576f54ec3754ca425ad4a30409f6f79c4c
parenteed98b49a02b52ba437b2c5ed3053fec723c5c17 (diff)
parente9e2707feffd01c39252afcdea15523c9883a7ea (diff)
downloadframeworks_base-d498a8ebb740af821693bb328eab16b6e291c003.zip
frameworks_base-d498a8ebb740af821693bb328eab16b6e291c003.tar.gz
frameworks_base-d498a8ebb740af821693bb328eab16b6e291c003.tar.bz2
am e9e2707f: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit 'e9e2707feffd01c39252afcdea15523c9883a7ea': docs: linux requirements update
-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 d712196..1100964 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -482,14 +482,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>