From 071360d1fe5cb75925e5a7ff1b799c5cab160a44 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Tue, 14 Dec 2010 16:35:36 -0800 Subject: [PATCH] cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux. Change-Id: I97a79004362e97732fa7d3be07c7396180f5fa99 --- docs/html/sdk/android-2.3-highlights.jd | 2 +- docs/html/sdk/android-2.3.jd | 4 ++-- docs/html/sdk/requirements.jd | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/html/sdk/android-2.3-highlights.jd b/docs/html/sdk/android-2.3-highlights.jd index f60bf519c92ed..1a603afb40c72 100644 --- a/docs/html/sdk/android-2.3-highlights.jd +++ b/docs/html/sdk/android-2.3-highlights.jd @@ -258,7 +258,7 @@ audio

href="http://www.khronos.org/opensles/">Khronos OpenSL ES, a standard API that gives applications access to powerful audio controls and effects from native code. Applications can use the API to manage audio devices and control -low-latency audio input, output and processing directly from native code

+audio input, output, and processing directly from native code.

Native graphics management

diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd index 5438adc135f5d..5b4f17bfddcb8 100644 --- a/docs/html/sdk/android-2.3.jd +++ b/docs/html/sdk/android-2.3.jd @@ -124,7 +124,7 @@ in {@sdkPlatformVersion}, including new features and changes in the framework API since the previous version.

-

SIP-based VOIP

+

SIP-based VoIP

The platform now includes a SIP protocol stack and framework API that lets developers build internet telephony applications. Using the API, applications can offer @@ -747,7 +747,7 @@ gyroscope sensor.

  • {@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip} — The application uses the SIP API on the device.
  • {@link android.content.pm.PackageManager#FEATURE_SIP_VOIP -android.software.sip.voip} — The application uses a SIP-based VOIP +android.software.sip.voip} — The application uses a SIP-based VoIP service on the device.
  • {@link android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND diff --git a/docs/html/sdk/requirements.jd b/docs/html/sdk/requirements.jd index 3679d44234bf2..a359dad729b14 100644 --- a/docs/html/sdk/requirements.jd +++ b/docs/html/sdk/requirements.jd @@ -8,12 +8,14 @@ Android applications using the Android SDK.