Skip to content

Commit 071360d

Browse files
committed
cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63
Doc change: Update min glibc version for linux. Change-Id: I97a79004362e97732fa7d3be07c7396180f5fa99
1 parent b94df62 commit 071360d

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

docs/html/sdk/android-2.3-highlights.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ audio</strong></p>
258258
href="http://www.khronos.org/opensles/">Khronos OpenSL ES</a>, a standard API
259259
that gives applications access to powerful audio controls and effects from
260260
native code. Applications can use the API to manage audio devices and control
261-
low-latency audio input, output and processing directly from native code</p>
261+
audio input, output, and processing directly from native code.</p>
262262

263263
<p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Native graphics
264264
management</strong></p>

docs/html/sdk/android-2.3.jd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ in {@sdkPlatformVersion}, including new features and changes in the framework
124124
API since the previous version.</p>
125125

126126

127-
<h3 id="sip">SIP-based VOIP</h3>
127+
<h3 id="sip">SIP-based VoIP</h3>
128128

129129
<p>The platform now includes a SIP protocol stack and framework API that lets
130130
developers build internet telephony applications. Using the API, applications can offer
@@ -747,7 +747,7 @@ gyroscope sensor.</li>
747747
<li>{@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip}
748748
&mdash; The application uses the SIP API on the device.</li>
749749
<li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP
750-
android.software.sip.voip} &mdash; The application uses a SIP-based VOIP
750+
android.software.sip.voip} &mdash; The application uses a SIP-based VoIP
751751
service on the device.</li>
752752
<li>{@link
753753
android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND

docs/html/sdk/requirements.jd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ Android applications using the Android SDK. </p>
88
<ul>
99
<li>Windows XP (32-bit), Vista (32- or 64-bit), or Windows 7 (32- or 64-bit)</li>
1010
<li>Mac OS X 10.5.8 or later (x86 only)</li>
11-
<li>Linux (tested on Linux Ubuntu Hardy Heron and Lucid Lynx)
11+
<li>Linux (tested on Ubuntu Linux, Lucid Lynx)
1212
<ul>
13+
<li>GNU C Library (glibc) 2.11 or later is required.</li>
14+
<li>On Ubuntu Linux, Lucid Lynx or later release is required.</li>
1315
<li>64-bit distributions must be capable of running 32-bit applications.
1416
For information about how to add support for 32-bit applications, see
1517
the <a href="installing.html#troubleshooting">Ubuntu Linux
16-
installation notes</a>.</li>
18+
installation notes</a>.</li>
1719
</ul>
1820
</li>
1921
</ul>

0 commit comments

Comments
 (0)