commit 6ccb72e685da6769d43545c21182ca44e039da3e
author Rich Slogar <rslogar@google.com> Fri Jan 30 01:41:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 30 01:41:58 2015 +0000
tree c88035d6dc29fa334d7a01cb51196d0e5f131fbc
parent a303121168f1e3cfe62f6836a38ba1a33f3e336d
parent e0063faa8707e2424a33625aaf2228540fa67e85

am e0063faa: Merge "docs: linux requirements update" into lmp-docs

* commit 'e0063faa8707e2424a33625aaf2228540fa67e85':
  docs: linux requirements update

docs/html/sdk/index.jd

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 @@
 
 <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>